修改到spring boot

search-console/src/main/java/com/uas/search/console/Application.java

@@ -0,0 +1,24 @@
+package com.uas.search.console;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+import com.uas.search.console.core.util.ContextUtils;
+
+@EnableTransactionManagement
+@EnableWebMvc
+@SpringBootApplication(scanBasePackages = "com.uas.search.console")
+@ImportResource({ "classpath:spring/provider.xml" })
+public class Application {
+
+	public static void main(String[] args) {
+		SpringApplication application = new SpringApplication(Application.class);
+		application.addListeners(new ContextUtils());
+		application.run(args);
+		// test profile, vm args: -Dspring.profiles.active=test
+	}
+
+}

search-console/src/main/java/com/uas/search/console/CacheConfiguration.java

@@ -0,0 +1,27 @@
+package com.uas.search.console;
+
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
+import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+@Configuration
+@EnableCaching
+public class CacheConfiguration {
+
+	@Bean("cacheManager")
+	public EhCacheCacheManager cacheManager(EhCacheManagerFactoryBean bean) {
+		return new EhCacheCacheManager(bean.getObject());
+	}
+
+	@Bean("ehcache")
+	public EhCacheManagerFactoryBean ehcache() {
+		EhCacheManagerFactoryBean bean = new EhCacheManagerFactoryBean();
+		bean.setConfigLocation(new ClassPathResource("spring/ehcache.xml"));
+		bean.setShared(true);
+		return bean;
+	}
+
+}

search-console/src/main/java/com/uas/search/console/DruidDBConfiguration.java

@@ -0,0 +1,130 @@
+package com.uas.search.console;
+
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+
+@Configuration
+public class DruidDBConfiguration {
+
+	private static Logger logger = LoggerFactory.getLogger(DruidDBConfiguration.class);
+
+	@Value("${spring.datasource.url}")
+	private String dbUrl;
+
+	@Value("${spring.datasource.username}")
+	private String username;
+
+	@Value("${spring.datasource.password}")
+	private String password;
+
+	@Value("${spring.datasource.driverClassName}")
+	private String driverClassName;
+
+	@Value("${spring.datasource.initialSize}")
+	private int initialSize;
+
+	@Value("${spring.datasource.minIdle}")
+	private int minIdle;
+
+	@Value("${spring.datasource.maxActive}")
+	private int maxActive;
+
+	@Value("${spring.datasource.maxWait}")
+	private int maxWait;
+
+	@Value("${spring.datasource.timeBetweenEvictionRunsMillis}")
+	private int timeBetweenEvictionRunsMillis;
+
+	@Value("${spring.datasource.minEvictableIdleTimeMillis}")
+	private int minEvictableIdleTimeMillis;
+
+	@Value("${spring.datasource.validationQuery}")
+	private String validationQuery;
+
+	@Value("${spring.datasource.testWhileIdle}")
+	private boolean testWhileIdle;
+
+	@Value("${spring.datasource.testOnBorrow}")
+	private boolean testOnBorrow;
+
+	@Value("${spring.datasource.testOnReturn}")
+	private boolean testOnReturn;
+
+	@Value("${spring.datasource.removeAbandoned}")
+	private boolean removeAbandoned;
+
+	@Value("${spring.datasource.poolPreparedStatements}")
+	private boolean poolPreparedStatements;
+
+	@Value("${spring.datasource.maxPoolPreparedStatementPerConnectionSize}")
+	private int maxPoolPreparedStatementPerConnectionSize;
+
+	@Value("${spring.datasource.filters}")
+	private String filters;
+
+	@Value("${spring.datasource.connectionProperties}")
+	private String connectionProperties;
+
+	@Bean("dataSource")
+	@Primary
+	public DataSource dataSource() {
+		DruidDataSource datasource = new DruidDataSource();
+
+		datasource.setUrl(dbUrl);
+		datasource.setUsername(username);
+		datasource.setPassword(password);
+		datasource.setDriverClassName(driverClassName);
+
+		// configuration
+		datasource.setInitialSize(initialSize);
+		datasource.setMinIdle(minIdle);
+		datasource.setMaxActive(maxActive);
+		datasource.setMaxWait(maxWait);
+		datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+		datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+		datasource.setValidationQuery(validationQuery);
+		datasource.setTestWhileIdle(testWhileIdle);
+		datasource.setTestOnBorrow(testOnBorrow);
+		datasource.setTestOnReturn(testOnReturn);
+		datasource.setRemoveAbandoned(removeAbandoned);
+		datasource.setPoolPreparedStatements(poolPreparedStatements);
+		datasource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
+		try {
+			datasource.setFilters(filters);
+		} catch (SQLException e) {
+			logger.error("druid configuration initialization filter", e);
+		}
+		datasource.setConnectionProperties(connectionProperties);
+
+		return datasource;
+	}
+
+	@Bean
+	public ServletRegistrationBean druidServlet() {
+		return new ServletRegistrationBean(new StatViewServlet(), "/druid/*");
+	}
+
+	@Bean
+	public FilterRegistrationBean filterRegistrationBean() {
+		FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+		filterRegistrationBean.setFilter(new WebStatFilter());
+		filterRegistrationBean.addUrlPatterns("/*");
+		filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.bmp,*.css,*.ico,*.html,/druid/*");
+		return filterRegistrationBean;
+	}
+
+}

search-console/src/main/java/com/uas/search/console/LuceneProperties.java

@@ -0,0 +1,37 @@
+package com.uas.search.console;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class LuceneProperties {
+
+	@Value("${lucene.indexes.dir}")
+	private String indexesDir;
+
+	@Value("${lucene.components.dir}")
+	private String componentsDir;
+
+	/**
+	 * 索引文件存储路径
+	 */
+	public String getIndexesDir() {
+		return indexesDir;
+	}
+
+	public void setIndexesDir(String indexesDir) {
+		this.indexesDir = indexesDir;
+	}
+
+	/**
+	 * 存放带有属性的器件数据的文件，用于创建索引
+	 */
+	public String getComponentsDir() {
+		return componentsDir;
+	}
+
+	public void setComponentsDir(String componentsDir) {
+		this.componentsDir = componentsDir;
+	}
+
+}

search-console/src/main/java/com/uas/search/console/WebAppConfiguration.java

@@ -0,0 +1,68 @@
+package com.uas.search.console;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+
+@Configuration
+@ComponentScan(basePackages = "com.uas.search.console.controller")
+public class WebAppConfiguration extends WebMvcConfigurerAdapter {
+
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		// Spring boot默认资源路径在src/main/resources下，而非/src/main/webapp
+		// 使用/src/main/webapp下资源均需在此添加
+		registry.addResourceHandler("/static/**").addResourceLocations("/resources/");
+		registry.addResourceHandler("/WEB-INF/**").addResourceLocations("/WEB-INF/");
+		super.addResourceHandlers(registry);
+	}
+
+	@Override
+	public void addViewControllers(ViewControllerRegistry registry) {
+		registry.addViewController("/").setViewName("index");
+		registry.addViewController("/console").setViewName("console");
+		registry.addViewController("/fileUpload").setViewName("fileUpload");
+		super.addViewControllers(registry);
+	}
+
+	@Override
+	public void configureViewResolvers(ViewResolverRegistry registry) {
+		InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
+		viewResolver.setPrefix("/WEB-INF/views/");
+		viewResolver.setSuffix(".html");
+		viewResolver.setContentType("text/html;charset=UTF-8");
+		registry.viewResolver(viewResolver);
+		super.configureViewResolvers(registry);
+	}
+
+	@Override
+	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+		FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
+		FastJsonConfig fastJsonConfig = new FastJsonConfig();
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect);
+		fastConverter.setFastJsonConfig(fastJsonConfig);
+		fastConverter.setSupportedMediaTypes(Arrays.asList(MediaType.APPLICATION_JSON_UTF8));
+		converters.add(fastConverter);
+
+		StringHttpMessageConverter messageConverter = new StringHttpMessageConverter();
+		messageConverter.setSupportedMediaTypes(Arrays.asList(MediaType.TEXT_HTML));
+		converters.add(messageConverter);
+
+		super.configureMessageConverters(converters);
+	}
+
+}

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

@@ -9,17 +9,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.uas.search.console.core.util.PathUtils;
-
 @Controller
 @RequestMapping("/upload")
 public class UploadController {
 
-	private static final String UPLOAD_DIR = PathUtils.getFilePath() + File.separator + "tmp" + File.separator;
+	private static final String UPLOAD_DIR = System.getProperty("java.io.tmpdir");
 
 	private Logger logger = Logger.getLogger(UploadController.class);
 
-	@RequestMapping("")
+	@RequestMapping
 	@ResponseBody
 	public String upload(MultipartFile file) {
 		String message = "";

search-console/src/main/java/com/uas/search/console/core/util/ContextUtils.java

@@ -1,8 +1,11 @@
 package com.uas.search.console.core.util;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
 
 /**
  * spring容器上下文对象
@@ -10,15 +13,17 @@ import org.springframework.context.ApplicationEvent;
  * @author yingp
  *
  */
-public class ContextUtils {
+public class ContextUtils implements ApplicationListener<ApplicationPreparedEvent> {
+
 	private static ApplicationContext applicationContext;
 
-	private static Logger logger = Logger.getLogger(ContextUtils.class);
+	private static Logger logger = LoggerFactory.getLogger(ContextUtils.class);
 
-	public static void setApplicationContext(ApplicationContext applicationContext) {
+	@Override
+	public void onApplicationEvent(ApplicationPreparedEvent event) {
 		synchronized (ContextUtils.class) {
 			logger.debug("setApplicationContext, notifyAll");
-			ContextUtils.applicationContext = applicationContext;
+			ContextUtils.applicationContext = event.getApplicationContext();
 			ContextUtils.class.notifyAll();
 		}
 	}

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

@@ -12,21 +12,21 @@ import javax.jms.QueueConnection;
 import javax.jms.QueueConnectionFactory;
 import javax.jms.Session;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import oracle.jms.AQjmsAdtMessage;
+import oracle.jms.AQjmsFactory;
+import oracle.jms.AQjmsSession;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSONException;
 import com.uas.search.console.core.util.ContextUtils;
 import com.uas.search.console.model.ParsedQueueMessage;
 import com.uas.search.console.service.IndexService;
 import com.uas.search.console.util.SearchConstants;
 
-import oracle.jms.AQjmsAdtMessage;
-import oracle.jms.AQjmsFactory;
-import oracle.jms.AQjmsSession;
-
 /**
  * 对数据库的消息队列进行实时监听
  * 
@@ -62,14 +62,11 @@ public class AQListener {
 			return message;
 		}
 
-		BasicDataSource dataSource = ContextUtils.getApplicationContext().getBean("dataSource",
-				org.apache.commons.dbcp.BasicDataSource.class);
+		DruidDataSource dataSource = ContextUtils.getApplicationContext().getBean("dataSource", DruidDataSource.class);
 
 		try {
-			QueueConnectionFactory queueConnectionFactory = AQjmsFactory.getQueueConnectionFactory(dataSource.getUrl(),
-					new Properties());
-			QueueConnection connection = queueConnectionFactory.createQueueConnection(dataSource.getUsername(),
-					dataSource.getPassword());
+			QueueConnectionFactory queueConnectionFactory = AQjmsFactory.getQueueConnectionFactory(dataSource.getUrl(), new Properties());
+			QueueConnection connection = queueConnectionFactory.createQueueConnection(dataSource.getUsername(), dataSource.getPassword());
 			AQjmsSession session = (AQjmsSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 			Queue queue = session.getQueue(dataSource.getUsername(), SearchConstants.LUCENE_QUEUE_NAME);
 			consumer = session.createConsumer(queue, null, QueueMessageTypeFactory.getFactory(), null, false);

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

@@ -15,6 +15,7 @@ import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.store.FSDirectory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import org.springframework.util.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.search.console.LuceneProperties;
 import com.uas.search.console.dao.BrandSimpleInfoDao;
 import com.uas.search.console.dao.ComponentSimpleInfoDao;
 import com.uas.search.console.dao.KindSimpleInfoDao;
@@ -52,7 +54,7 @@ import com.uas.search.exception.SearchException;
  * @since 2016年8月5日 下午2:23:22
  */
 @Service
-public class IndexServiceImpl implements IndexService {
+public class IndexServiceImpl implements IndexService, InitializingBean {
 
 	@Autowired
 	private KindSimpleInfoDao kindDao;
@@ -84,6 +86,9 @@ public class IndexServiceImpl implements IndexService {
 	@Autowired
 	private AQListener aqListener;
 
+	@Autowired
+	private LuceneProperties luceneProperties;
+
 	/**
 	 * 是否正在创建索引
 	 */
@@ -93,9 +98,10 @@ public class IndexServiceImpl implements IndexService {
 
 	private Logger logger = Logger.getLogger(IndexServiceImpl.class);
 
-	public IndexServiceImpl() {
+	@Override
+	public void afterPropertiesSet() throws Exception {
 		try {
-			directory = FSDirectory.open(Paths.get(SearchConstants.INDEX_DIR));
+			directory = FSDirectory.open(Paths.get(luceneProperties.getIndexesDir()));
 			indexWriterManager = new IndexWriterManager(directory);
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -194,7 +200,7 @@ public class IndexServiceImpl implements IndexService {
 		Long size = 0L;
 		try {
 			// 从本地路径读取器件数据
-			File[] files = new File(SearchConstants.COMPONENT_WITH_PROPERTY_DIR).listFiles();
+			File[] files = new File(luceneProperties.getComponentsDir()).listFiles();
 			if (files == null || files.length == 0) {
 				logger.info("创建器件索引失败，原因：器件数据文件不存在！");
 				return 0L;
@@ -212,8 +218,7 @@ public class IndexServiceImpl implements IndexService {
 						size++;
 						// 每创建10000条，打印一次进度
 						if (size % 10000 == 0) {
-							logger.info(String.format("Component indexed...................%.2f%%",
-									size * 100.0 / totalSize));
+							logger.info(String.format("Component indexed...................%.2f%%", size * 100.0 / totalSize));
 						}
 						indexWriter.addDocument(document);
 					}
@@ -369,29 +374,28 @@ public class IndexServiceImpl implements IndexService {
 			try {
 				indexWriter = indexWriterManager.get();
 				if (obj instanceof KindSimpleInfo) {
-					indexWriter.updateDocument(
-							new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((KindSimpleInfo) obj).getId())),
+					indexWriter.updateDocument(new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((KindSimpleInfo) obj).getId())),
 							document);
 				} else if (obj instanceof BrandSimpleInfo) {
-					indexWriter.updateDocument(
-							new Term(SearchConstants.BRAND_ID_FIELD, String.valueOf(((BrandSimpleInfo) obj).getId())),
+					indexWriter.updateDocument(new Term(SearchConstants.BRAND_ID_FIELD, String.valueOf(((BrandSimpleInfo) obj).getId())),
 							document);
 				} else if (obj instanceof ComponentSimpleInfo) {
-					indexWriter.updateDocument(new Term(SearchConstants.COMPONENT_ID_FIELD,
-							String.valueOf(((ComponentSimpleInfo) obj).getId())), document);
-				} else if (obj instanceof OrderSimpleInfo) {
 					indexWriter.updateDocument(
-							new Term(SearchConstants.ORDER_ID_FIELD, String.valueOf(((OrderSimpleInfo) obj).getId())),
+							new Term(SearchConstants.COMPONENT_ID_FIELD, String.valueOf(((ComponentSimpleInfo) obj).getId())), document);
+				} else if (obj instanceof OrderSimpleInfo) {
+					indexWriter.updateDocument(new Term(SearchConstants.ORDER_ID_FIELD, String.valueOf(((OrderSimpleInfo) obj).getId())),
 							document);
 				} else if (obj instanceof OrderInvoiceSimpleInfo) {
-					indexWriter.updateDocument(new Term(SearchConstants.ORDER_INVOICE_ID_FIELD,
-							String.valueOf(((OrderInvoiceSimpleInfo) obj).getId())), document);
+					indexWriter.updateDocument(
+							new Term(SearchConstants.ORDER_INVOICE_ID_FIELD, String.valueOf(((OrderInvoiceSimpleInfo) obj).getId())),
+							document);
 				} else if (obj instanceof PurchaseSimpleInfo) {
-					indexWriter.updateDocument(new Term(SearchConstants.PURCHASE_ID_FIELD,
-							String.valueOf(((PurchaseSimpleInfo) obj).getId())), document);
+					indexWriter.updateDocument(
+							new Term(SearchConstants.PURCHASE_ID_FIELD, String.valueOf(((PurchaseSimpleInfo) obj).getId())), document);
 				} else if (obj instanceof PurchaseInvoiceSimpleInfo) {
-					indexWriter.updateDocument(new Term(SearchConstants.PURCHASE_INVOICE_ID_FIELD,
-							String.valueOf(((PurchaseInvoiceSimpleInfo) obj).getId())), document);
+					indexWriter.updateDocument(
+							new Term(SearchConstants.PURCHASE_INVOICE_ID_FIELD, String.valueOf(((PurchaseInvoiceSimpleInfo) obj).getId())),
+							document);
 				} else {
 					logger.error("Message parsing failed!");
 				}
@@ -415,26 +419,23 @@ public class IndexServiceImpl implements IndexService {
 		try {
 			indexWriter = indexWriterManager.get();
 			if (obj instanceof KindSimpleInfo) {
-				indexWriter.deleteDocuments(
-						new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((KindSimpleInfo) obj).getId())));
+				indexWriter.deleteDocuments(new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((KindSimpleInfo) obj).getId())));
 			} else if (obj instanceof BrandSimpleInfo) {
-				indexWriter.deleteDocuments(
-						new Term(SearchConstants.BRAND_ID_FIELD, String.valueOf(((BrandSimpleInfo) obj).getId())));
+				indexWriter.deleteDocuments(new Term(SearchConstants.BRAND_ID_FIELD, String.valueOf(((BrandSimpleInfo) obj).getId())));
 			} else if (obj instanceof ComponentSimpleInfo) {
 				indexWriter.deleteDocuments(new Term(SearchConstants.COMPONENT_ID_FIELD,
 						String.valueOf(((ComponentSimpleInfo) obj).getId())));
 			} else if (obj instanceof OrderSimpleInfo) {
-				indexWriter.deleteDocuments(
-						new Term(SearchConstants.ORDER_ID_FIELD, String.valueOf(((OrderSimpleInfo) obj).getId())));
+				indexWriter.deleteDocuments(new Term(SearchConstants.ORDER_ID_FIELD, String.valueOf(((OrderSimpleInfo) obj).getId())));
 			} else if (obj instanceof OrderInvoiceSimpleInfo) {
-				indexWriter.deleteDocuments(new Term(SearchConstants.ORDER_INVOICE_ID_FIELD,
-						String.valueOf(((OrderInvoiceSimpleInfo) obj).getId())));
+				indexWriter.deleteDocuments(new Term(SearchConstants.ORDER_INVOICE_ID_FIELD, String.valueOf(((OrderInvoiceSimpleInfo) obj)
+						.getId())));
 			} else if (obj instanceof PurchaseSimpleInfo) {
-				indexWriter.deleteDocuments(new Term(SearchConstants.PURCHASE_ID_FIELD,
-						String.valueOf(((PurchaseSimpleInfo) obj).getId())));
+				indexWriter
+						.deleteDocuments(new Term(SearchConstants.PURCHASE_ID_FIELD, String.valueOf(((PurchaseSimpleInfo) obj).getId())));
 			} else if (obj instanceof PurchaseInvoiceSimpleInfo) {
-				indexWriter.deleteDocuments(new Term(SearchConstants.PURCHASE_INVOICE_ID_FIELD,
-						String.valueOf(((PurchaseInvoiceSimpleInfo) obj).getId())));
+				indexWriter.deleteDocuments(new Term(SearchConstants.PURCHASE_INVOICE_ID_FIELD, String
+						.valueOf(((PurchaseInvoiceSimpleInfo) obj).getId())));
 			} else {
 				logger.error("Message parsing failed!");
 			}

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

@@ -1,19 +0,0 @@
-package com.uas.search.console.support;
-
-import org.apache.log4j.Logger;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-import com.uas.search.console.core.util.ContextUtils;
-
-public class ApplicationContextRegister implements ApplicationContextAware {
-
-	private static Logger logger = Logger.getLogger(ApplicationContextRegister.class);
-
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		ContextUtils.setApplicationContext(applicationContext);
-		logger.debug("ApplicationContext registed");
-	}
-
-}

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

@@ -11,7 +11,8 @@ import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.NIOFSDirectory;
 
-import com.uas.search.console.util.SearchConstants;
+import com.uas.search.console.LuceneProperties;
+import com.uas.search.console.core.util.ContextUtils;
 
 /**
  * 将索引加入缓存，对IndexSearcher进行管理
@@ -28,13 +29,14 @@ public class IndexSearcherManager {
 	private Logger logger = Logger.getLogger(IndexSearcherManager.class);
 
 	public IndexSearcherManager() {
+		LuceneProperties luceneProperties = ContextUtils.getBean(LuceneProperties.class);
 		try {
 			String os = System.getProperty("os.name");
 			// 本来NIOFSDirectory速度更快，但因为jre的bug，在Windows平台上，其性能很差
 			if (os.toLowerCase().startsWith("win")) {
-				directory = FSDirectory.open(Paths.get(SearchConstants.INDEX_DIR));
+				directory = FSDirectory.open(Paths.get(luceneProperties.getIndexesDir()));
 			} else {
-				directory = NIOFSDirectory.open(Paths.get(SearchConstants.INDEX_DIR));
+				directory = NIOFSDirectory.open(Paths.get(luceneProperties.getIndexesDir()));
 			}
 			warm();
 		} catch (IOException e) {

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

@@ -95,8 +95,7 @@ public class MergeComponentData {
 					printWriter.flush();
 					printWriter.close();
 					fileIndex++;
-					printWriter = new PrintWriter(
-							DATA_DIR + "\\components\\ComponentWithProperty_" + fileIndex + ".txt");
+					printWriter = new PrintWriter(DATA_DIR + "\\components\\ComponentWithProperty_" + fileIndex + ".txt");
 				}
 
 				ComponentSimpleInfo component = parseComponent(componentLine);
@@ -156,9 +155,9 @@ public class MergeComponentData {
 		}
 	}
 
-	public static void main(String[] args) {
-		merge();
-		// readData();
-	}
+	// public static void main(String[] args) {
+	// merge();
+	// // readData();
+	// }
 
 }

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

@@ -4,8 +4,6 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
-import com.uas.search.console.core.util.PathUtils;
-
 /**
  * 索引相关的常量
  * 
@@ -73,16 +71,6 @@ public class SearchConstants {
 	 */
 	public static final String PURCHASE_INVOICE_TABLE_NAME = "trade$invoice_fmpu";
 
-	/**
-	 * 索引文件存储路径
-	 */
-	public static final String INDEX_DIR = PathUtils.getFilePath() + "indexes";
-
-	/**
-	 * 存放带有属性的器件数据的文件，用于创建索引
-	 */
-	public static final String COMPONENT_WITH_PROPERTY_DIR = PathUtils.getFilePath() + "components";
-
 	/**
 	 * 单据搜索时，若限定时间范围，可以键值对的形式传递参数，该键代表最小（远）时间
 	 */

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

@@ -0,0 +1,25 @@
+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
+    hbm2ddl:
+     auto: update
+     
+multipart:
+ enabled: true
+
+security:
+ user:
+  name: admin
+  password: select111***
+  role: ADMIN
+ ignored:
+  - /static/**

search-console/src/main/resources/dev/dubbo.properties

@@ -1,2 +0,0 @@
-dubbo.owner=test
-dubbo.group=test

search-console/src/main/resources/dev/jdbc.properties

@@ -1,12 +0,0 @@
-#test model
-jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
-jdbc.username=uuplatformdemo
-jdbc.password=selectuuplatform
-jdbc.initialSize=10
-jdbc.maxActive=100
-jdbc.maxIdle=50
-jdbc.minIdle=50
-jdbc.suspectTimeout=60
-jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000

search-console/src/main/resources/dev/logging.properties

@@ -1,15 +0,0 @@
-#Tomcat Logger
-
-handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler   
-  
-############################################################   
-# Handler specific properties.   
-# Describes specific configuration info for Handlers.   
-############################################################   
-  
-org.apache.juli.FileHandler.level = FINE   
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs   
-org.apache.juli.FileHandler.prefix = error-debug.   
-  
-java.util.logging.ConsoleHandler.level = FINE   
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

search-console/src/main/resources/prod/dubbo.properties

@@ -1,2 +0,0 @@
-dubbo.owner=prod
-dubbo.group=prod

search-console/src/main/resources/prod/jdbc.properties

@@ -1,12 +0,0 @@
-#product mode
-jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
-jdbc.username=platform$b2b
-jdbc.password=select*fromuu
-jdbc.initialSize=10
-jdbc.maxActive=100
-jdbc.maxIdle=50
-jdbc.minIdle=50
-jdbc.suspectTimeout=60
-jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000

search-console/src/main/resources/prod/logging.properties

@@ -1,15 +0,0 @@
-#Tomcat Logger
-
-handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler   
-  
-############################################################   
-# Handler specific properties.   
-# Describes specific configuration info for Handlers.   
-############################################################   
-  
-org.apache.juli.FileHandler.level = FINE   
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs   
-org.apache.juli.FileHandler.prefix = error-debug.   
-  
-java.util.logging.ConsoleHandler.level = FINE   
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

search-console/src/main/resources/spring/applicationContext.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:task="http://www.springframework.org/schema/task"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:cache="http://www.springframework.org/schema/cache" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd   
-	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.1.xsd
-	http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
-	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.1.xsd">
-
-	<context:property-placeholder location="classpath*:${profile}/*.properties" />
-	<!-- 注册spring上下文对象 -->
-	<bean class="com.uas.search.console.support.ApplicationContextRegister" />
-
-	<!-- 扫描注解 -->
-	<context:annotation-config />
-	<!-- 扫描的包 -->
-	<context:component-scan base-package="com.uas.search.console" />
-	
-	<!-- dataSource -->
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
-		destroy-method="close">
-		<property name="driverClassName" value="${jdbc.driverClassName}" />
-		<property name="url" value="${jdbc.url}" />
-		<property name="username" value="${jdbc.username}" />
-		<property name="password" value="${jdbc.password}" />
-		<!-- 连接初始值，连接池启动时创建的连接数量的初始值 -->
-		<property name="initialSize" value="${jdbc.initialSize}" />
-		<!-- 连接池的最大值，同一时间可以从池分配的最多连接数量，0时无限制 -->
-		<property name="maxActive" value="${jdbc.maxActive}" />
-		<!-- 最大空闲值.当经过一个高峰时间后，连接池可以慢慢将已经用不到的连接慢慢释放一部分，一直减少到maxIdle为止 ，0时无限制 -->
-		<property name="maxIdle" value="${jdbc.maxIdle}" />
-		<!-- 最小空闲值.当空闲的连接数少于阀值时，连接池就会预申请去一些连接，以免洪峰来时来不及申请 -->
-		<property name="minIdle" value="${jdbc.minIdle}" />
-		<!-- 是否对已备语句进行池管理（布尔值），是否对PreparedStatement进行缓存 -->
-		<property name="poolPreparedStatements" value="true" />
-		<!-- 是否对sql进行自动提交 -->
-		<property name="defaultAutoCommit" value="true" />
-		<!-- 回收超时连接 -->
-		<property name="removeAbandoned" value="true" />
-		<!-- 连接空闲时校验连接有效性 -->
-		<property name="testWhileIdle" value="true" />
-		<!-- 校验连接有效性的sql -->
-		<property name="validationQuery" value="select 1 from dual" />
-		<!-- 每过timeBetweenEvictionRunsMillis 时间，就会启动一个线程，校验连接池中闲置时间超过minEvictableIdleTimeMillis的连接对象 -->
-		<property name="timeBetweenEvictionRunsMillis" value="${jdbc.timeBetweenEvictionRunsMillis}" />
-		<property name="minEvictableIdleTimeMillis" value="${jdbc.minEvictableIdleTimeMillis}" />
-	</bean>
-	<!-- hibernate jpa -->
-	<bean class="org.springframework.orm.jpa.JpaTransactionManager"
-		id="transactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-	</bean>
-	<tx:annotation-driven transaction-manager="transactionManager" />
-
-	<bean id="transactionInterceptor"
-		class="org.springframework.transaction.interceptor.TransactionInterceptor">
-		<property name="transactionManager" ref="transactionManager" />
-		<property name="transactionAttributeSource">
-			<bean
-				class="org.springframework.transaction.annotation.AnnotationTransactionAttributeSource"></bean>
-		</property>
-	</bean>
-
-	<bean id="transactionAttributeSourceAdvisor"
-		class="org.springframework.transaction.interceptor.TransactionAttributeSourceAdvisor">
-		<property name="transactionInterceptor" ref="transactionInterceptor" />
-	</bean>
-
-	<bean id="entityManagerFactory"
-		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="persistenceUnitName" value="persistenceUnit" />
-		<!-- <property name="persistenceXmlLocation" value="classpath*:META-INF/persistence.xml" 
-			/> -->
-		<property name="packagesToScan" value="com.uas.search.console" />
-		<property name="dataSource" ref="dataSource" />
-		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-				<property name="generateDdl" value="false" />
-				<property name="databasePlatform" value="org.hibernate.dialect.Oracle10gDialect" />
-				<property name="showSql" value="false" />
-			</bean>
-		</property>
-		<property name="jpaDialect">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaDialect" />
-		</property>
-		<property name="jpaProperties">
-			<props>
-				<prop key="hibernate.cache.provider_configuration_file_resource_path">classpath:spring/ehcache.xml</prop>
-				<prop key="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory
-				</prop>
-				<prop key="hibernate.cache.use_query_cache">true</prop>
-				<prop key="hibernate.cache.use_second_level_cache">true</prop>
-				<prop key="hibernate.generate_statistics">true</prop>
-				<prop key="hibernate.use_sql_comments">true</prop>
-				<prop key="hibernate.format_sql">true</prop>
-				<prop key="hibernate.generate_statistics">true</prop>
-				<prop key="hibernate.enable_lazy_load_no_trans">true</prop>
-			</props>
-		</property>
-	</bean>
-	<!-- jdbctemplate -->
-	<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-	<!-- 使用ehcache对象缓存 -->
-	<cache:annotation-driven />
-	<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">
-		<property name="cacheManager" ref="ehcache"></property>
-	</bean>
-	<bean id="ehcache"
-		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-		<property name="configLocation" value="classpath:spring/ehcache.xml"></property>
-		<property name="shared" value="true"></property>
-	</bean>
-	
-	<!-- jpa -->
-	<import resource="jpa.xml"/>
-	
-	<!-- dubbo 服务 -->
-	<import resource="provider.xml"/>
-	
-</beans>

search-console/src/main/resources/spring/jpa.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/data/jpa"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-	http://www.springframework.org/schema/beans/spring-beans.xsd 
-	http://www.springframework.org/schema/data/jpa 
-	http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
-
-	<repositories base-package="com.uas.search.console" />
-
-</beans:beans>

search-console/src/main/resources/test/dubbo.properties

@@ -1,2 +0,0 @@
-dubbo.owner=test
-dubbo.group=test

search-console/src/main/resources/test/jdbc.properties

@@ -1,12 +0,0 @@
-#test model
-jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
-jdbc.username=uuplatformdemo
-jdbc.password=selectuuplatform
-jdbc.initialSize=10
-jdbc.maxActive=100
-jdbc.maxIdle=50
-jdbc.minIdle=50
-jdbc.suspectTimeout=60
-jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000

search-console/src/main/resources/test/logging.properties

@@ -1,15 +0,0 @@
-#Tomcat Logger
-
-handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler   
-  
-############################################################   
-# Handler specific properties.   
-# Describes specific configuration info for Handlers.   
-############################################################   
-  
-org.apache.juli.FileHandler.level = FINE   
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs   
-org.apache.juli.FileHandler.prefix = error-debug.   
-  
-java.util.logging.ConsoleHandler.level = FINE   
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

search-console/src/main/webapp/WEB-INF/web.xml

@@ -1,86 +0,0 @@
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	version="3.0"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-app_3_0.xsd">
-
-	<display-name>search-console</display-name>
-	<description>The implementation of Search Service.</description>
-
-	<context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>spring.webapp.dfs</param-value>
-	</context-param>
-	<context-param>
-		<param-name>spring.profiles.active</param-name>
-		<param-value>production</param-value>
-	</context-param>
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/log4j.properties</param-value>
-	</context-param>
-	<context-param>
-		<param-name>log4jRefreshInterval</param-name>
-		<param-value>60000</param-value>
-	</context-param>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath*:spring/applicationContext.xml</param-value>
-	</context-param>
-	
-	<!-- filters -->
-	<filter>
-		<filter-name>CharacterEncodingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-		<async-supported>true</async-supported>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>UTF-8</param-value>
-		</init-param>
-		<init-param>
-			<param-name>forceEncoding</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>CharacterEncodingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<filter>
-		<filter-name>HttpMethodFilter</filter-name>
-		<filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
-		<async-supported>true</async-supported>
-	</filter>
-	<filter-mapping>
-		<filter-name>HttpMethodFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	
-	<!-- Handles Spring requests -->
-	<servlet>
-		<servlet-name>spring-mvc-dispatcher</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/webmvc.xml</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>spring-mvc-dispatcher</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-	
-	<!-- Creates the Spring Container shared by all Servlets and Filters -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
-	<!-- Spring localization -->
-	<listener>
-		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
-	</listener>
-
-</web-app>

search-console/src/main/webapp/WEB-INF/webmvc.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-	<mvc:annotation-driven>
-		<mvc:message-converters register-defaults="true">
-			<!-- 避免IE执行AJAX时,返回JSON出现下载文件 -->
-			<bean id="fastJsonHttpMessageConverter"
-				class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
-				<property name="supportedMediaTypes">
-					<list>
-						<value>application/json;charset=UTF-8</value>
-					</list>
-				</property>
-				<property name="features">
-					<list>
-						<value>DisableCircularReferenceDetect</value>
-					</list>
-				</property>
-			</bean>
-			<!-- 解决Controller返回String时中文乱码的问题 -->
-			<bean class="org.springframework.http.converter.StringHttpMessageConverter">
-				<!-- 不可为text/plain -->
-				<property name="supportedMediaTypes" value="text/html;charset=UTF-8" />
-			</bean>
-		</mvc:message-converters>
-	</mvc:annotation-driven>
-
-	<mvc:default-servlet-handler />
-
-	<mvc:resources mapping="/static/**" location="/resources/" />
-
-	<context:component-scan base-package="com.uas.search.console" />
-
-	<bean id="multipartResolver"
-		class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
-
-	<bean
-		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/WEB-INF/views/" />
-		<property name="suffix" value=".html" />
-		<property name="contentType" value="text/html;charset=UTF-8" />
-	</bean>
-
-	<mvc:view-controller path="/" view-name="index" />
-	<mvc:view-controller path="/console" view-name="console" />
-	<mvc:view-controller path="/fileUpload" view-name="fileUpload" />
-
-</beans>