|
@@ -3,7 +3,6 @@ package public
|
|
|
import (
|
|
import (
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"fmt"
|
|
"fmt"
|
|
|
- "jfw/config"
|
|
|
|
|
"log"
|
|
"log"
|
|
|
"qfw/util"
|
|
"qfw/util"
|
|
|
"qfw/util/elastic"
|
|
"qfw/util/elastic"
|
|
@@ -285,7 +284,7 @@ func GetDataExportSearchCountUseId(_id string) (count int) {
|
|
|
if count > 0 {
|
|
if count > 0 {
|
|
|
res = doSearch(qstr, 0, count, "")
|
|
res = doSearch(qstr, 0, count, "")
|
|
|
}
|
|
}
|
|
|
- secondKWS := HttpEs(scd.Keyword[0].Keyword, "ik_smart", config.Sysconfig["elasticsearch"].(string))
|
|
|
|
|
|
|
+ secondKWS := HttpEs(scd.Keyword[0].Keyword, "ik_smart", DbConf.Elasticsearch.Main.Address)
|
|
|
scd.Keyword[0].Keyword = secondKWS
|
|
scd.Keyword[0].Keyword = secondKWS
|
|
|
scd.SelectType = "title"
|
|
scd.SelectType = "title"
|
|
|
qstr = getDataExportSql(scd)
|
|
qstr = getDataExportSql(scd)
|
|
@@ -367,7 +366,7 @@ func GetDataExportSearchResultUseId(_id, dataType string, count int) (*[]map[str
|
|
|
if count > 0 {
|
|
if count > 0 {
|
|
|
res = doSearch(qstr, 0, count, "")
|
|
res = doSearch(qstr, 0, count, "")
|
|
|
}
|
|
}
|
|
|
- secondKWS := HttpEs(scd.Keyword[0].Keyword, "ik_smart", config.Sysconfig["elasticsearch"].(string))
|
|
|
|
|
|
|
+ secondKWS := HttpEs(scd.Keyword[0].Keyword, "ik_smart", DbConf.Elasticsearch.Main.Address)
|
|
|
scd.Keyword[0].Keyword = secondKWS
|
|
scd.Keyword[0].Keyword = secondKWS
|
|
|
scd.SelectType = "title"
|
|
scd.SelectType = "title"
|
|
|
qstr = getDataExportSql(scd)
|
|
qstr = getDataExportSql(scd)
|
