去除无用的配置

hugufei
Commit dfdc612cfb33e8de49d533a65fe77e0a73bca043 1 parent b3f8b95e
Showing 3 changed files with 12 additions and 35 deletions
web/src/main/resources/config.properties
web/src/main/webapp/META-INF/autoconf/auto-config.xml
web/src/main/webapp/META-INF/autoconf/config.properties
--- a/web/src/main/resources/config.properties
View file @dfdc612
+++ b/web/src/main/resources/config.properties
View file @dfdc612
@@ -9,21 +9,20 @@ redis.readonly.proxy.auth=
 #search
 search.es.cluster.name=yohosearch_test
 search.es.servers=192.168.102.209:9300 192.168.102.216:9300
-search.index.number_of_replicas=2
+search.index.number_of_replicas=1
 search.index.refresh_interval=1
 search.index.translog.flush_threshold_ops=5000
 #search
 search.minimum.should.match=75%
 search.operator=and
-search.default.field=productName_ansj^10,brandName^500,brandDomain^100,brandNameCn^100,brandNameEn^100,maxSort^300,middleSort^500,smallSort^1000,searchField_ansj,productSkn_ansj,brandNameCn_pinyin^100,maxSort_pinyin^300,middleSort_pinyin^500,smallSort_pinyin^1000,productKeyword^500,searchField
+search.default.field=productName_ansj^10,brandName^500,brandDomain^100,brandNameCn^100,brandNameEn^100,maxSort^300,middleSort^500,smallSort^1000,searchField_ansj,productSkn_ansj,brandNameCn_pinyin^100,maxSort_pinyin^300,middleSort_pinyin^500,smallSort_pinyin^1000,productKeyword^500,brandKeyword^50,searchField
 search.script.score=_score+doc['sortWeight'].value*0.003+(100-doc['breakingRate'].value)/100 * doc['salesWithDateDiff'].value/pow((now-doc['shelveTime'].value)/3600+2,1.8)
 search.script.lang=groovy
 search.use.cache=true
-
-#tpl
 tpl.adaptor.valid=true
+
 #zkAddress
 zkAddress=192.168.102.205:2181
--- a/web/src/main/webapp/META-INF/autoconf/auto-config.xml
View file @dfdc612
+++ b/web/src/main/webapp/META-INF/autoconf/auto-config.xml
View file @dfdc612
@@ -5,30 +5,6 @@
         <property name="yoho.search.service.env.namespace" defaultValue="yohosearch" description="namespace"/>
         <property name="yoho.search.service.env.serverport" defaultValue="0" description="port"/>
         <property name="yoho.search.service.env.webapphome" defaultValue="/home/dev/yoho-search-service/deploy" description="install path"/>
-
-        <property name="search.es.cluster.name" defaultValue="yohosearch_test" description="" />
-        <property name="search.es.servers" defaultValue="192.168.102.209:9300 192.168.102.216:9300" description="" />
-        <property name="search.index.number_of_replicas" defaultValue="1" description="" />
-        <property name="search.index.refresh_interval" defaultValue="1" description="" />
-        <property name="search.index.translog.flush_threshold_ops" defaultValue="5000" description="" />
-        <property name="search.index.batch.limit" defaultValue="5000" description="" />
-        <property name="search.index.batch.limit.tbl" defaultValue="2000" description="" />
-        <property name="search.index.batch.max.thread.size" defaultValue="10" description="" />
-        <property name="search.minimum.should.match" defaultValue="75%" description="" />
-        <property name="search.operator" defaultValue="and" description="" />
-        <property name="search.default.field" defaultValue="productName_ansj^10,brandName^500,brandDomain^100,brandNameCn^100,brandNameEn^100,maxSort^300,middleSort^500,smallSort^1000,searchField_ansj,productSkn_ansj,brandNameCn_pinyin^100,maxSort_pinyin^300,middleSort_pinyin^500,smallSort_pinyin^1000,productKeyword^500,brandKeyword^500,searchField" description="" />
-        <property name="search.script.score" defaultValue="_score+doc['sortWeight'].value*0.003+(100-doc['breakingRate'].value)/100 * doc['salesWithDateDiff'].value/pow((now-doc['shelveTime'].value)/3600+2,1.8)" description="" />
-        <property name="search.script.lang" defaultValue="groovy" description="" />
-        
-        <property name="search.use.cache" defaultValue="false" description="搜索结果是否使用缓存" />
-        <property name="tpl.adaptor.valid" defaultValue="true" description="全球购融合是否生效" />
-
-        <property name="jdbc.mysql.yhbsearch.datasources" defaultValue="yhb_search_2016" description="" />
-        <property name="jdbc.mysql.yhbsearch.master" defaultValue="192.168.102.216:3306" description="" />
-        <property name="jdbc.mysql.yhbsearch.slave" defaultValue="192.168.102.216:3306" description="" />
-        <property name="jdbc.mysql.yhbsearch.username" defaultValue="yh_test" description="" />
-        <property name="jdbc.mysql.yhbsearch.password" defaultValue="9nm0icOwt6bMHjMusIfMLw==" description="" />
-
     </group>
     <script>
         <generate template="META-INF/autoconf/databases.yml" destfile="WEB-INF/classes/databases.yml"/>
--- a/web/src/main/webapp/META-INF/autoconf/config.properties
View file @dfdc612
+++ b/web/src/main/webapp/META-INF/autoconf/config.properties
View file @dfdc612
@@ -14,13 +14,15 @@ search.index.refresh_interval=${search.index.refresh_interval}
 search.index.translog.flush_threshold_ops=${search.index.translog.flush_threshold_ops}
 #search
-search.minimum.should.match=${search.minimum.should.match}
-search.operator=${search.operator}
-search.default.field=${search.default.field}
-search.script.score=${search.script.score}
-search.script.lang=${search.script.lang}
-search.use.cache=${search.use.cache}
-tpl.adaptor.valid=${tpl.adaptor.valid}
+search.minimum.should.match=75%
+search.operator=and
+search.default.field=productName_ansj^10,brandName^500,brandDomain^100,brandNameCn^100,brandNameEn^100,maxSort^300,middleSort^500,smallSort^1000,searchField_ansj,productSkn_ansj,brandNameCn_pinyin^100,maxSort_pinyin^300,middleSort_pinyin^500,smallSort_pinyin^1000,productKeyword^500,brandKeyword^50,searchField
+search.script.score=_score+doc['sortWeight'].value*0.003+(100-doc['breakingRate'].value)/100 * doc['salesWithDateDiff'].value/pow((now-doc['shelveTime'].value)/3600+2,1.8)
+search.script.lang=groovy
+
+search.use.cache=true
+
+tpl.adaptor.valid=true
 #zkAddress
 zkAddress=${zkAddress}