Merge branch 'ysx-search-20200724' into dev

conf/database_prod.ini.demo

-[gorm]
+[gorm]
 mode = debug
 mode = debug
 
 
+#线上地址
+#mysql://LxiCSpu:Mysx3Tyzlo00oxlmlly@172.18.137.29:3306
 [spu]
 [spu]
-user_name = spu
-password = spu
-host = 192.168.1.234
+user_name = LxiCSpu
+password = Mysx3Tyzlo00oxlmlly
+host = 172.18.137.29
 database = liexin_spu
 database = liexin_spu
 table_prefix =lie_
 table_prefix =lie_
 type = mysql
 type = mysql
-test = 1
 
 
 #线上地址
 #线上地址
 #SupDbUser:Supssy2@@!!@$#yxy@172.18.137.21:3306/liexin_supp
 #SupDbUser:Supssy2@@!!@$#yxy@172.18.137.21:3306/liexin_supp
 [supp]
 [supp]
-user_name = liexin_ass
-password = `liexin_ass#zsyM`
-host = 192.168.2.232
-database = liexin_ass
+user_name = SupDbUser
+password = `Supssy2@@!!@$#yxy`
+host = 172.18.137.21
+database = liexin_supp
 table_prefix =lie_
 table_prefix =lie_
 type = mysql
 type = mysql
 
 
+#线上地址
+#mysql://dtuserread:dAtaL#ym2902m2lLX2y33@172.18.137.22:3306/icdata#utf8
 [cms]
 [cms]
-user_name = ichuntcms
-password = `ichuntcms#zsyM`
-host = 192.168.2.232
-database = ichuntcms
+user_name = dtuserread
+password = `dAtaL#ym2902m2lLX2y33`
+host = 172.18.137.22
+database = icdata
 table_prefix =
 table_prefix =
 type = mysql
 type = mysql

conf/message_prod.ini.demo

 [DINGDING]
 [DINGDING]
-SEARCH_API_MONITOR = 6d0fa85e01a02c39347d011ae973fd21b76c6c7ce582d3ea470c6b65a318848d
+SEARCH_API_MONITOR = cd1661d0ce733a8ff0b603b532b317aae9de6dbaf39186b0352f272e47a860e8
\ No newline at end of file

conf/rabmq_key_prod.ini.demo

-[rabmq]
-url = amqp://guest:guest@192.168.2.232:5672/
+[rabmq]
+url = amqp://huntweb:xMtMi29zTm@119.23.79.136:5672/
 ;存放本系统所有的队列名称
 ;存放本系统所有的队列名称
 [rabmq_all]
 [rabmq_all]
 ; bom任务id
 ; bom任务id

conf/redis_config_prod.ini.demo

 [default_redis_read]
 [default_redis_read]
-host = 192.168.1.235:6379
+host = 172.18.137.39:6379
 password = icDb29mLy2s
 password = icDb29mLy2s
 max_idle = 50
 max_idle = 50
 max_active = 100
 max_active = 100
 idle_timeout = 20
 idle_timeout = 20
 
 
 [default_redis_write]
 [default_redis_write]
-host = 192.168.1.235:6379
+host = 172.18.137.38:6379
 password = icDb29mLy2s
 password = icDb29mLy2s
 max_idle = 50
 max_idle = 50
 max_active = 100
 max_active = 100
 idle_timeout = 20
 idle_timeout = 20
 
 
 
 
-[api_redis]
-host = 192.168.1.235:6379
+[api_redis_read]
+host = 172.18.137.38:6379
+password = icDb29mLy2s
+max_idle = 50
+max_active = 100
+idle_timeout = 20
+
+
+[api_redis_write]
+host = 172.18.137.39:6379
 password = icDb29mLy2s
 password = icDb29mLy2s
 max_idle = 50
 max_idle = 50
 max_active = 100
 max_active = 100

conf/redis_key_prod.ini.demo

-;存放本系统所有的redis键值对和解析
+;存放本系统所有的redis键值对和解析
 [redis_all]
 [redis_all]
 ;供应商redis的首key
 ;供应商redis的首key
 SUPPLIER_REDIS_PRE=SUPPLIER_REDIS_INFO_
 SUPPLIER_REDIS_PRE=SUPPLIER_REDIS_INFO_

conf/search.prod.ini.demo

-[SUPPLIER_ALL]
+[SUPPLIER_ALL]
 1 = future
 1 = future
 2 = powerandsignal
 2 = powerandsignal
 3 = rochester
 3 = rochester
@@ -13,56 +13,52 @@
 12 = alliedelec
 12 = alliedelec
 13 = avnet
 13 = avnet
 14 = mouser
 14 = mouser
-#16 = liexin_lianying1
+15 = company
+16 = liexin_lianying1
 17 = zhuanmai
 17 = zhuanmai
 18 = liexin_ti
 18 = liexin_ti
 19 = peigenesis
 19 = peigenesis
 20 = powell
 20 = powell
 21 = rs
 21 = rs
-1676 = buerklin
+22 = liexin_sell
 
 
+100 = ziying
+101 = liexin_jingdiao
+1672 = master
+1673 = rutronik
+1675 = corestaff
+1676 = buerklin
+1677 = microchip
+1678 = heilind
+1680 = wpg
+1681 = jameco
+1679 = ti
+1684 = distrelec
+1685 = tlc
+1686 = adi
+
+#搜索结果页合并供应商
 [SEARCH_SUPPLIER_MERGE]
 [SEARCH_SUPPLIER_MERGE]
-17 = zhuanmai
-1 = future
-3 = rochester
-6 = element14
-7 = digikey
-8 = chip1stop
-9 = aipco
-12 = alliedelec
-13 = avnet
-19 = peigenesis
-20 = powell
-21 = rs
-
-[SEARCH_SUPPLIER]
 1 = future
 1 = future
-#2 = powerandsignal
 3 = rochester
 3 = rochester
-4 = tme
-5 = verical
 6 = element14
 6 = element14
-7 = digikey
+#7 = digikey
 8 = chip1stop
 8 = chip1stop
 9 = aipco
 9 = aipco
-10 = arrow
-#11 = bisco
 12 = alliedelec
 12 = alliedelec
 13 = avnet
 13 = avnet
-14 = mouser
-#15 = company
-#16 = liexin_lianying1
-17 = zhuanmai
-#18 = liexin_ti
 19 = peigenesis
 19 = peigenesis
 20 = powell
 20 = powell
 21 = rs
 21 = rs
-#22 = liexin_sell
-
-#100 = ziying
-#101 = liexin_jingdiao
-1676 = buerklin
-
+1675 = corestaff
+1677 = microchip
+1678 = heilind
+1680 = wpg
+1681 = jameco
+1679 = ti
+1684 = distrelec
+1685 = tlc
+1686 = adi
 #相似物料供应商
 #相似物料供应商
 [ALIKE_SUPPLIER]
 [ALIKE_SUPPLIER]
 1 = ti
 1 = ti