Commit b570b378 by 孙龙

up

parent 2ff90e41
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"search_server/pkg/config" "search_server/pkg/config"
"search_server/pkg/gredis" "search_server/pkg/gredis"
"search_server/pkg/logger" "search_server/pkg/logger"
"search_server/pkg/mongo"
"search_server/pkg/mysql" "search_server/pkg/mysql"
) )
...@@ -12,15 +13,19 @@ func Boot(configPath string) (err error) { ...@@ -12,15 +13,19 @@ func Boot(configPath string) (err error) {
panic(err) panic(err)
} }
if err = mysql.Setup(); err != nil { if err = mysql.Setup(); err != nil {
panic(err)
return return
} }
if err = gredis.Setup(); err != nil { if err = gredis.Setup(); err != nil {
panic(err)
return
}
if err = mongo.SetUp(); err != nil {
panic(err)
return return
} }
//if err = mongo.SetUp(); err != nil {
// return
//}
if err = logger.SetUp(); err != nil { if err = logger.SetUp(); err != nil {
panic(err)
return return
} }
return return
......
...@@ -195,3 +195,4 @@ SEARCH_TOKEN_EXPIRE_TIME = 30 ...@@ -195,3 +195,4 @@ SEARCH_TOKEN_EXPIRE_TIME = 30
[SEARCH_API_LOG] [SEARCH_API_LOG]
SEARCH_API_ERROR_PRE = search_api_overtime_ SEARCH_API_ERROR_PRE = search_api_overtime_
...@@ -45,7 +45,9 @@ func Index(ctx *gin.Context){ ...@@ -45,7 +45,9 @@ func Index(ctx *gin.Context){
zyhRequest[requestName] = strings.TrimSpace(requstValue[0]) zyhRequest[requestName] = strings.TrimSpace(requstValue[0])
} }
} }
zyServiceImpl := service.NewZyServiceImpl() zyServiceImpl := service.NewZyServiceImpl()
zyhResponse = zyServiceImpl.Index(ctx,zyhRequest) zyhResponse = zyServiceImpl.Index(ctx,zyhRequest)
common.Output(int(zyhResponse.ErrorCode), zyhResponse.ErrorMsg, zyhResponse.Data) common.Output(int(zyhResponse.ErrorCode), zyhResponse.ErrorMsg, zyhResponse.Data)
return return
......
...@@ -31,6 +31,7 @@ require ( ...@@ -31,6 +31,7 @@ require (
github.com/syyongx/php2go v0.9.4 github.com/syyongx/php2go v0.9.4
github.com/tidwall/gjson v1.6.0 github.com/tidwall/gjson v1.6.0
github.com/uniplaces/carbon v0.1.6 github.com/uniplaces/carbon v0.1.6
go.mongodb.org/mongo-driver v1.3.5 // indirect
go.uber.org/zap v1.14.1 // indirect go.uber.org/zap v1.14.1 // indirect
golang.org/x/tools v0.0.0-20191216173652-a0e659d51361 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361
google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece // indirect google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece // indirect
......
package config
type MongoDbDatabase struct {
Host string
UserName string
Password string
Database string
MaxPoolSize string
}
func BuildMongoDbConfgs () map[string]MongoDbDatabase{
return map[string]MongoDbDatabase{
"default" : {
Host:Get("mongo.host").String(),
UserName:Get("mongo.username").String(),
Password:Get("mongo.password").String(),
Database:Get("mongo.database").String(),
MaxPoolSize:Get("mongo.maxPoolSize").String(),
},
}
}
package mongo package mongo
import ( import (
"fmt"
"gopkg.in/mgo.v2" "gopkg.in/mgo.v2"
"search_server/pkg/config" "search_server/pkg/config"
"strconv"
) )
var session *mgo.Session var session *mgo.Session
func SetUp() (err error) {
url := config.Get("mongo.url").String() type ichuntMongo struct {
MongoList map[string]*mgo.Session
}
var ichuntMongo_ = &ichuntMongo{}
func getconn(mongoConfig config.MongoDbDatabase) (*mgo.Session ,error){
url := mongoConfig.Host
maxPoolSize := mongoConfig.MaxPoolSize
maxPoolSizeInt,err := strconv.Atoi(maxPoolSize)
if err != nil{
maxPoolSizeInt = 100
}
url += "?maxPoolSize="+maxPoolSize
session, err = mgo.Dial(url) session, err = mgo.Dial(url)
if err != nil { if err != nil {
return err return nil ,err
} }
return fmt.Println("url",url)
fmt.Println("maxPoolSizeInt",maxPoolSizeInt)
session.SetPoolLimit(maxPoolSizeInt)
session.SetMode(mgo.Monotonic, true)
myDB :=session.DB(mongoConfig.Database)
err = myDB.Login(mongoConfig.UserName,mongoConfig.Password)
if err != nil {
return nil ,err
}
return session,nil
} }
func GetDB() *mgo.Database { func SetUp() (err error) {
database := config.Get("mongo.database").String() err = nil
db := session.DB(database) ichuntMongo_.MongoList = make(map[string]*mgo.Session,0)
return db mongodbList := config.BuildMongoDbConfgs()
if len(mongodbList) > 0{
for mongoName,mongoConfig := range mongodbList{
ichuntMongo_.MongoList[mongoName],err = getconn(mongoConfig)
if err != nil{
break
}
}
}
return err
}
func Conn(connection string) (*mgo.Session){
return ichuntMongo_.MongoList[connection].Copy()
} }
...@@ -9,6 +9,8 @@ import ( ...@@ -9,6 +9,8 @@ import (
"github.com/prometheus/common/log" "github.com/prometheus/common/log"
"github.com/syyongx/php2go" "github.com/syyongx/php2go"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
"gopkg.in/olivere/elastic.v5" "gopkg.in/olivere/elastic.v5"
"math" "math"
"regexp" "regexp"
...@@ -18,6 +20,7 @@ import ( ...@@ -18,6 +20,7 @@ import (
"search_server/pkg/config" "search_server/pkg/config"
"search_server/pkg/es" "search_server/pkg/es"
"search_server/pkg/gredis" "search_server/pkg/gredis"
"search_server/pkg/mongo"
"search_server/service/transformer" "search_server/service/transformer"
"strconv" "strconv"
"strings" "strings"
...@@ -140,6 +143,8 @@ func zy(req map[string]string,_type byte,isCheck byte) (rsp *model.ZyhResponse){ ...@@ -140,6 +143,8 @@ func zy(req map[string]string,_type byte,isCheck byte) (rsp *model.ZyhResponse){
func(this *ZyServiceImpl) Index(ctx *gin.Context, req map[string]string) (rsp *model.ZyhResponse){ func(this *ZyServiceImpl) Index(ctx *gin.Context, req map[string]string) (rsp *model.ZyhResponse){
req2 := req req2 := req
zy_orgin_search = common.CopyMapString(req)//原始搜索數據 zy_orgin_search = common.CopyMapString(req)//原始搜索數據
xx := ziyingCache(req,1)
fmt.Println(xx)
rsp = searchZiYingGoods(req2,false,nil,nil,1) rsp = searchZiYingGoods(req2,false,nil,nil,1)
return rsp return rsp
} }
...@@ -842,8 +847,6 @@ func makeQuery(query *elastic.BoolQuery,source *elastic.SearchSource,conditions ...@@ -842,8 +847,6 @@ func makeQuery(query *elastic.BoolQuery,source *elastic.SearchSource,conditions
} }
//整理自营数据参数 //整理自营数据参数
func dullZiYingGoodsInfo(goods_id_str string,keyword string,goods_name_arr []string,goods_list []model.ApiGoods) (ziyinGoodsInfo model.ZiyinGoodsInfo, ok bool){ func dullZiYingGoodsInfo(goods_id_str string,keyword string,goods_name_arr []string,goods_list []model.ApiGoods) (ziyinGoodsInfo model.ZiyinGoodsInfo, ok bool){
isHas := false isHas := false
...@@ -938,3 +941,90 @@ func dullZiYingGoodsInfo(goods_id_str string,keyword string,goods_name_arr []str ...@@ -938,3 +941,90 @@ func dullZiYingGoodsInfo(goods_id_str string,keyword string,goods_name_arr []str
return ziyinGoodsInfo,true return ziyinGoodsInfo,true
} }
/*
符合条件 直接读缓存,不需要再查es+redis
@param string type 获取缓存数据:1 单独获取列表数据(class_id第一页数据) 2 单独获取aggs统计 3 获取列表(class_id第一页数据)+aggs统计
*/
func ziyingCache(req map[string]string,_type byte) ( bool){
var(
err error
cache bool = true
pInt int //page int
class_id int
mongodb *mgo.Session
)
//是否开启缓存
if isOpen,err :=config.Get("ZIYING_CACHE.is_no_ziying_cache").Bool() ;err == nil && !isOpen{
return false
}
p := req["p"]
if p != "" {
pInt ,_ = strconv.Atoi(p);
}
is_cache := req["is_cache"]
if pInt >1 || is_cache == "1"{
cache = false
}else{
nocache := []string{"callback","p","pf","class_id/condition","qwertyuiop","asdfghjkl","_"}
for k,_:=range req{
if php2go.InArray(k,[]string{"flag","no_rule","hcy_test","Yo4teW_uid"}){
continue
}
if !php2go.InArray(k,nocache) {
cache = false
}
}
}
if !cache{
//return false
}
//需要查缓存
class_idCondition := req["class_id/condition"]
if class_idCondition != ""{
class_id,_ = strconv.Atoi(class_idCondition)
}
agg_table := config.Get("AGG_TABLE.agg_table").String()
firstLists_table := config.Get("FIRSTLISTS_TABLE.firstLists_table").String()
class_id=class_id
err=err
mongodb = mongo.Conn("default");
defer mongodb.Close()
c :=mongodb.DB("ichunt").C(firstLists_table)
c1 :=mongodb.DB("ichunt").C(agg_table)
//var res interface{}
type res struct {
ID bson.ObjectId `json:"_id" bson:"_id"`
ClassId int `json:"class_id" bson:"class_id"`
//Data string `json:"data",bson:"data"`
UpdateTime string `json:"update_time" bson:"update_time"`
}
result := res{}
switch _type {
case 1://单独获取列表数据(class_id第一页数据)
err := c.Find(bson.M{"class_id":class_id}).One(&result)
fmt.Println("err",err)
if err == nil{
}
break
case 2://#单独获取aggs
err := c.Find(bson.M{"class_id":class_id}).One(&result)
fmt.Println("err",err)
if err == nil{
}
break
case 3://获取列表(class_id第一页数据)+aggs统计
}
return true
}
\ No newline at end of file
package main package main
import (
"bytes"
"io"
)
const debug = false
func main() {
var buf *bytes.Buffer
if debug {
buf = new(bytes.Buffer) // enable collection of output
}
f(buf) // NOTE: subtly incorrect!
if debug {
// ...use buf...
}
}
// If out is non-nil, output will be written to it.
func f(out io.Writer) {
// ...do something...
if out != nil {
out.Write([]byte("done!\n"))
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment