Merge pull request #178 from JakduK/develop

Develop
JakduK · Jan 1, 2017 · ec65933 · ec65933
2 parents e864bd5 + 94d868b
commit ec65933
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 11 deletions.
diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
@@ -2,7 +2,6 @@
 spring.http.multipart.enabled=true
 spring.http.multipart.max-file-size=8MB
 spring.http.multipart.max-request-size=8MB
-spring.http.multipart.location=/tmp/jakduk
 
 # view resolver
 spring.mvc.view.prefix=/WEB-INF/views/

diff --git a/api/src/test/java/com/jakduk/api/common/CommonTest.java b/api/src/test/java/com/jakduk/api/common/CommonTest.java
@@ -15,17 +15,13 @@ public class CommonTest extends AbstractSpringTest {
 	@Autowired
 	CommonService commonService;
 
-	@Value("${storage.temp.path}")
-	private String storageTempPath;
-
 	@Autowired
 	private Environment environment;
 
 	private PasswordEncoder passwordEncoder = new StandardPasswordEncoder();
 
 	@Test
 	public void environmentTest() {
-		System.out.println(storageTempPath);
 		System.out.println(environment.getProperty("mongo.db.name"));
 	}
 

diff --git a/core/src/main/java/com/jakduk/core/service/SearchService.java b/core/src/main/java/com/jakduk/core/service/SearchService.java
@@ -52,9 +52,7 @@
 import org.springframework.util.ObjectUtils;
 
 import java.io.IOException;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -313,14 +311,15 @@ public PopularSearchWordResult aggregateSearchWord(Long registerDateFrom, Intege
 		SearchRequestBuilder searchRequestBuilder = client.prepareSearch()
 				.setIndices(elasticsearchIndexSearchWord)
 				.setTypes(CoreConst.ES_TYPE_SEARCH_WORD)
-				.setSize(size)
+				.setSize(0)
 				.setQuery(
 						QueryBuilders.rangeQuery("registerDate").gte(registerDateFrom)
 				)
 				.addAggregation(
 						AggregationBuilders
 								.terms("popular_word_aggs")
 								.field("word")
+								.size(size)
 				);
 
 		log.debug("aggregateSearchWord Query:\n" + searchRequestBuilder.internalBuilder());

diff --git a/core/src/main/resources/application-core-default.properties b/core/src/main/resources/application-core-default.properties
@@ -26,7 +26,6 @@ core.elasticsearch.bulk.concurrent.requests=2
 email.enable = false
 
 # file server path
-storage.temp.path = /home/pyohwan/tmp
 storage.image.path = /home/pyohwan/storage/image/
 storage.thumbnail.path = /home/pyohwan/storage/thumbnail/
 

diff --git a/core/src/main/resources/application-core-production.properties b/core/src/main/resources/application-core-production.properties
@@ -23,7 +23,6 @@ core.elasticsearch.bulk.concurrent.requests=2
 email.enable = true
 
 # file server path
-storage.temp.path = /jakduk/temp
 storage.image.path = /jakduk/storage/image/
 storage.thumbnail.path = /jakduk/storage/thumbnail/
 

diff --git a/core/src/main/resources/application-core-staging.properties b/core/src/main/resources/application-core-staging.properties
@@ -23,7 +23,6 @@ core.elasticsearch.bulk.concurrent.requests=2
 email.enable = true
 
 # file server path
-storage.temp.path = /jakduk/temp
 storage.image.path = /jakduk/storage/image/
 storage.thumbnail.path = /jakduk/storage/thumbnail/