|
@@ -9,6 +9,7 @@ import (
|
|
|
"jy/util"
|
|
|
"log"
|
|
|
"qfw/util/elastic"
|
|
|
+ "qfw/util/redis"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
@@ -111,13 +112,21 @@ func init() {
|
|
|
return
|
|
|
}else {
|
|
|
delete(e, "_id")
|
|
|
- qykredis := util.QykRedisPool.Conn()
|
|
|
+ qykredis := redis.RedisPool[util.QYK_RedisName].Get()
|
|
|
defer qykredis.Close()
|
|
|
- if saveRedis:=qykredis.Set(agency_name,sid,0);saveRedis.Err()!= nil{
|
|
|
- log.Println("保存redis 错误",saveRedis.Err())
|
|
|
- c.JSON(200, gin.H{"rep": 500,"err":"保存reids出错"})
|
|
|
+ if _,err := qykredis.Do("SELECT",util.AgencyDB);err != nil{
|
|
|
+ log.Println("保存redis 错误", err)
|
|
|
+ c.JSON(200, gin.H{"rep": 500, "err": "select reids出错"})
|
|
|
return
|
|
|
+ }else {
|
|
|
+ if _,saveRedisErr := qykredis.Do("SET",agency_name, sid); saveRedisErr != nil {
|
|
|
+ log.Println("保存redis 错误", saveRedisErr)
|
|
|
+ c.JSON(200, gin.H{"rep": 500, "err": "保存reids出错"})
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
escon := elastic.GetEsConn()
|
|
|
defer elastic.DestoryEsConn(escon)
|
|
|
_, err := escon.Index().Index(util.ElasticClientAgencyIndex).Type(util.ElasticClientAgencyType).Id(sid).BodyJson(e).Refresh(true).Do()
|
|
@@ -187,18 +196,26 @@ func init() {
|
|
|
_id := c.PostForm("_id")
|
|
|
agency_name := c.PostForm("agency_name")
|
|
|
if bson.IsObjectIdHex(_id) {
|
|
|
- delisok := Mgo.Del(util.ElasticClientAgencyDB, bson.M{"_id": bson.ObjectIdHex(_id)})
|
|
|
- if !delisok{
|
|
|
- c.JSON(200, gin.H{"rep": 500,"err":"删除mongo错误"})
|
|
|
+ delisok := Mgo.Del(util.ElasticClientDB, bson.M{"_id": bson.ObjectIdHex(_id)})
|
|
|
+ if !delisok {
|
|
|
+ c.JSON(200, gin.H{"rep": 500, "err": "删除mongo错误"})
|
|
|
return
|
|
|
}
|
|
|
- qykredis := util.QykRedisPool.Conn()
|
|
|
+ qykredis := redis.RedisPool[util.QYK_RedisName].Get()
|
|
|
defer qykredis.Close()
|
|
|
- if del := qykredis.Del(agency_name);del.Err()!=nil{
|
|
|
- log.Println("delete agency err:", del.Err(),agency_name)
|
|
|
- c.JSON(200, gin.H{"rep": 500,"err":"删除redis错误"})
|
|
|
+ if _,err :=qykredis.Do("SELECT",util.AgencyDB);err!=nil{
|
|
|
+ log.Println("delete agency err:", err, agency_name)
|
|
|
+ c.JSON(200, gin.H{"rep": 500, "err": "删除redis错误"})
|
|
|
return
|
|
|
+ }else {
|
|
|
+ if _,delErr := qykredis.Do("DEL",agency_name); delErr != nil {
|
|
|
+ log.Println("delete agency err:", delErr, agency_name)
|
|
|
+ c.JSON(200, gin.H{"rep": 500, "err": "删除redis错误"})
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
escon := elastic.GetEsConn()
|
|
|
defer elastic.DestoryEsConn(escon)
|
|
|
_, err := escon.Delete().Index(util.ElasticClientAgencyIndex).Type(util.ElasticClientAgencyType).Id(_id).Refresh(true).Do()
|