x

src/main/java/com/egolm/shop/ShopApplication.java

@@ -4,10 +4,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
+@EnableScheduling
 @EnableCaching
 @EnableSwagger2
 @SpringBootApplication

src/main/java/com/egolm/shop/config/SolrConfig.java

@@ -2,23 +2,21 @@ package com.egolm.shop.config;
 
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class SolrConfig {
-
-	@Value("${solr.baseURL}")
-	private String baseURL;
+	
+	@Value("${solr.goods.core-url}")
+	private String houseUrl;
 	
 	@Bean
-	public HttpSolrClient httpSolrClient() {
-		System.out.println(baseURL);
-		return new Builder().withBaseSolrUrl(baseURL).build();
-		//return new HttpSolrClient(baseURL);
+	@Qualifier("goodsSolrClient")
+	public HttpSolrClient getHouseHttpSolrClient() {
+		return new Builder().withBaseSolrUrl(houseUrl).build();
 	}
 	
 }
-
-

src/main/java/com/egolm/shop/service/impl/GoodsServiceImpl.java

@@ -369,7 +369,7 @@ public class GoodsServiceImpl implements GoodsService {
 	public String goodsDetail(Map<String, Object> map) {
 		String goodsId=(String) map.get("goodsId"); 
 		String contractNo=(String) map.get("contractNo");
-		String sql = "select * from tAgentContractGoods where sContractNO = ? and nGoodsID = ?";
+		String sql = "select * from tAgentContractGoods where sAgentContractNO = ? and nGoodsID = ?";
 		Map<String, Object> detail = jdbcTemplate.queryForMap(sql, contractNo, goodsId);
 		List<Map<String,Object>>  picList =  goodsPicList(goodsId, contractNo);
 		return Rjx.jsonOk().set("goodsDetail", detail).set("imgGroup", picList).toJson();

src/main/resources/application.properties

 spring.profiles.active=dev
 spring.messages.basename=messages
 ###版本号
-maven.build.timestamp=@maven.build.timestamp@
+maven.build.timestamp=@maven.build.timestamp@
\ No newline at end of file
+
+sql.house.create-index-query= sql/goods/create-index-query.sql
+sql.house.delete-index-query= sql/goods/delete-index-query.sql
+sql.house.update-index-query= sql/goods/update-index-query.sql
+solr.house.core-url= http://10.10.0.15:8983/solr/house
+solr.house.offset-minute-for-day: 1500
+solr.house.offset-minute-for-minute: 10
+solr.house.cron-for-day: 0 0 3 * * ?
+solr.house.cron-for-minute: 0 * * * * ?
\ No newline at end of file