yoho-search / yoho-search-consumer · Commits

Go to a project

Authored by wangnan
Commit 8036e8790a157532d778cd3d4094db37900e97ea 1 parent e1b0d951

fix

Inline Side-by-side
Showing 18 changed files with 6 additions and 130 deletions
1 -eclipse.preferences.version=1  
2 -encoding//src/main/java=UTF-8  
3 -encoding//src/main/resources=UTF-8  
4 -encoding//src/test/java=UTF-8  
5 -encoding/<project>=UTF-8  
1 -eclipse.preferences.version=1  
2 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled  
3 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8  
4 -org.eclipse.jdt.core.compiler.compliance=1.8  
5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error  
6 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error  
7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning  
8 -org.eclipse.jdt.core.compiler.source=1.8  
1 -activeProfiles=  
2 -eclipse.preferences.version=1  
3 -resolveWorkspaceProjects=true  
4 -version=1  
1 -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">  
2 - <wb-module deploy-name="search-consumer-index">  
3 - <wb-resource deploy-path="/" source-path="/src/main/java"/>  
4 - <wb-resource deploy-path="/" source-path="/src/main/resources"/>  
5 - </wb-module>  
6 -</project-modules>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<faceted-project>  
3 - <installed facet="java" version="1.8"/>  
4 - <installed facet="jst.utility" version="1.0"/>  
5 -</faceted-project>  
1 -disabled=06target  
2 -eclipse.preferences.version=1  
1 -Manifest-Version: 1.0  
2 -Class-Path:  
3 -  
@@ -9,7 +9,7 @@ public class CostStatistics { @@ -9,7 +9,7 @@ public class CostStatistics {
9 9
10 private List<Long> statistics = new ArrayList<Long>(); 10 private List<Long> statistics = new ArrayList<Long>();
11 11
12 - private long toalCost = 0; 12 + private long totalCost = 0;
13 13
14 public CostStatistics(){ 14 public CostStatistics(){
15 this.begin = System.currentTimeMillis(); 15 this.begin = System.currentTimeMillis();
@@ -18,14 +18,14 @@ public class CostStatistics { @@ -18,14 +18,14 @@ public class CostStatistics {
18 public long getCost(){ 18 public long getCost(){
19 long current = System.currentTimeMillis(); 19 long current = System.currentTimeMillis();
20 long cost = current - begin; 20 long cost = current - begin;
21 - toalCost = toalCost + cost; 21 + totalCost = totalCost + cost;
22 begin = current; 22 begin = current;
23 statistics.add(cost); 23 statistics.add(cost);
24 return cost; 24 return cost;
25 } 25 }
26 26
27 public long getTotalCost(){ 27 public long getTotalCost(){
28 - return toalCost; 28 + return totalCost;
29 } 29 }
30 30
31 public List<Long> getCostStatistics(){ 31 public List<Long> getCostStatistics(){
@@ -15,24 +15,21 @@ public class DynamicConfigService { @@ -15,24 +15,21 @@ public class DynamicConfigService {
15 15
16 /** 16 /**
17 * 全球购融合到有货是否开启 17 * 全球购融合到有货是否开启
18 - *  
19 - * @return  
20 */ 18 */
21 public boolean isTblToYohoOpen() { 19 public boolean isTblToYohoOpen() {
22 return configReader.getBoolean("search.degrade.consumer.adaptor.tbltoyoho.open", false); 20 return configReader.getBoolean("search.degrade.consumer.adaptor.tbltoyoho.open", false);
23 } 21 }
24 22
25 public boolean suggestKeywordTypeOpen(KeywordType keywordType) { 23 public boolean suggestKeywordTypeOpen(KeywordType keywordType) {
26 - String globleEnabledKey = keywordType.getGlobleEnabledKey();  
27 - if (StringUtils.isBlank(globleEnabledKey)) { 24 + String globalEnabledKey = keywordType.getGlobleEnabledKey();
  25 + if (StringUtils.isBlank(globalEnabledKey)) {
28 return true; 26 return true;
29 } 27 }
30 - return configReader.getBoolean(globleEnabledKey, true); 28 + return configReader.getBoolean(globalEnabledKey, true);
31 } 29 }
32 30
33 /** 31 /**
34 * 是否打开搜索无结果或结果太少时的搜索词建议功能 32 * 是否打开搜索无结果或结果太少时的搜索词建议功能
35 - * @return  
36 */ 33 */
37 public boolean isIncreasementSpiderOpen(){ 34 public boolean isIncreasementSpiderOpen(){
38 return configReader.getBoolean("search.suggestion.increasement.spider.open", true); 35 return configReader.getBoolean("search.suggestion.increasement.spider.open", true);
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<classpath>  
3 - <classpathentry kind="src" path="src/main/webapp"/>  
4 - <classpathentry kind="src" path="target/m2e-wtp/web-resources"/>  
5 - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>  
6 - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">  
7 - <attributes>  
8 - <attribute name="hide" value="true"/>  
9 - </attributes>  
10 - </classpathentry>  
11 - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>  
12 - <classpathentry kind="output" path=""/>  
13 -</classpath>  
1 -eclipse.preferences.version=1  
2 -encoding//src/main/java=UTF-8  
3 -encoding//src/main/resources=UTF-8  
4 -encoding//src/test/java=UTF-8  
5 -encoding//src/test/resources=UTF-8  
6 -encoding/<project>=UTF-8  
1 -eclipse.preferences.version=1  
2 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled  
3 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8  
4 -org.eclipse.jdt.core.compiler.compliance=1.8  
5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error  
6 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error  
7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning  
8 -org.eclipse.jdt.core.compiler.source=1.8  
1 -activeProfiles=  
2 -eclipse.preferences.version=1  
3 -resolveWorkspaceProjects=true  
4 -version=1  
1 -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">  
2 - <wb-module deploy-name="yoho-search-consumer-web">  
3 - <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>  
4 - <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>  
5 - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>  
6 - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>  
7 - <dependent-module archiveName="yoho-core-dal-1.2.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-core-dal/yoho-core-dal">  
8 - <dependency-type>uses</dependency-type>  
9 - </dependent-module>  
10 - <dependent-module archiveName="yoho-core-common-1.2.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-core-common/yoho-core-common">  
11 - <dependency-type>uses</dependency-type>  
12 - </dependent-module>  
13 - <dependent-module archiveName="yoho-core-config-1.2.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-core-config/yoho-core-config">  
14 - <dependency-type>uses</dependency-type>  
15 - </dependent-module>  
16 - <dependent-module archiveName="search-consumer-dal-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/search-consumer-dal/search-consumer-dal">  
17 - <dependency-type>uses</dependency-type>  
18 - </dependent-module>  
19 - <dependent-module archiveName="search-personalized-2.0.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/search-personalized/search-personalized">  
20 - <dependency-type>uses</dependency-type>  
21 - </dependent-module>  
22 - <dependent-module archiveName="search-es-2.0.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/search-es/search-es">  
23 - <dependency-type>uses</dependency-type>  
24 - </dependent-module>  
25 - <dependent-module archiveName="yoho-core-redis-1.2.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-core-redis/yoho-core-redis">  
26 - <dependency-type>uses</dependency-type>  
27 - </dependent-module>  
28 - <dependent-module archiveName="search-consumer-service-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/search-consumer-service/search-consumer-service">  
29 - <dependency-type>uses</dependency-type>  
30 - </dependent-module>  
31 - <dependent-module archiveName="search-base-2.0.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/search-base/search-base">  
32 - <dependency-type>uses</dependency-type>  
33 - </dependent-module>  
34 - <dependent-module archiveName="yoho-core-alarm-1.2.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-core-alarm/yoho-core-alarm">  
35 - <dependency-type>uses</dependency-type>  
36 - </dependent-module>  
37 - <dependent-module archiveName="search-consumer-index-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/search-consumer-index/search-consumer-index">  
38 - <dependency-type>uses</dependency-type>  
39 - </dependent-module>  
40 - <dependent-module archiveName="search-consumer-spider-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/search-consumer-spider/search-consumer-spider">  
41 - <dependency-type>uses</dependency-type>  
42 - </dependent-module>  
43 - <property name="context-root" value="yoho-search-consumer-web"/>  
44 - <property name="java-output-path" value="/yoho-search-consumer-web/target/classes"/>  
45 - </wb-module>  
46 -</project-modules>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<faceted-project>  
3 - <fixed facet="wst.jsdt.web"/>  
4 - <installed facet="java" version="1.8"/>  
5 - <installed facet="jst.web" version="3.0"/>  
6 - <installed facet="wst.jsdt.web" version="1.0"/>  
7 -</faceted-project>  
1 -org.eclipse.wst.jsdt.launching.baseBrowserLibrary  
1 -disabled=06target  
2 -eclipse.preferences.version=1