|
@@ -136,7 +136,7 @@ func biddingTask(mapInfo map[string]interface{}) {
|
|
|
wg.Wait()
|
|
|
log.Info("biddingTask over", zap.Int("count", c1), zap.Int("index", index))
|
|
|
|
|
|
- //发送udp,
|
|
|
+ ////发送udp,附件补采 才需要
|
|
|
//data := map[string]interface{}{
|
|
|
// "stype": "update",
|
|
|
// "gtid": mongodb.StringTOBsonId(mapInfo["gtid"].(string)),
|
|
@@ -152,8 +152,11 @@ func biddingTask(mapInfo map[string]interface{}) {
|
|
|
// log.Info("biddingTask ", zap.Any("WriteUdp err", err), zap.Any("target", target))
|
|
|
//}
|
|
|
//
|
|
|
- //log.Info("biddingTask ", zap.Any("target", target))
|
|
|
- // 重采平台需要
|
|
|
+ //log.Info("biddingTask ", zap.Any("target", target), zap.Any("data", data))
|
|
|
+ //
|
|
|
+
|
|
|
+ //
|
|
|
+ //重采平台需要
|
|
|
//mapInfo["stype"] = ""
|
|
|
//datas, _ := json.Marshal(mapInfo)
|
|
|
//var next = &net.UDPAddr{
|
|
@@ -607,7 +610,12 @@ func getFileText(tmp map[string]interface{}) (filetext string) {
|
|
|
if resultMap, ok := result.(map[string]interface{}); resultMap != nil && ok {
|
|
|
if attach_url := util.ObjToString(resultMap["attach_url"]); attach_url != "" {
|
|
|
bs := oss.OssGetObject(attach_url, mongodb.BsonIdToSId(tmp["_id"])) //oss读数据
|
|
|
- if utf8.RuneCountInString(filetext+bs) < 550000 {
|
|
|
+ //附件总长度限制550000,其中最后一个文件长度限制50000
|
|
|
+ size := config.Conf.DB.Oss.Filesize
|
|
|
+ if size <= 0 {
|
|
|
+ size = 500000
|
|
|
+ }
|
|
|
+ if utf8.RuneCountInString(filetext+bs) < 50000+size {
|
|
|
filetext += bs + "\n"
|
|
|
} else {
|
|
|
if len(bs) > 50000 {
|
|
@@ -615,10 +623,9 @@ func getFileText(tmp map[string]interface{}) (filetext string) {
|
|
|
} else {
|
|
|
filetext += bs
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
//附件总长度限制550000
|
|
|
- if utf8.RuneCountInString(filetext) >= 550000 {
|
|
|
+ if utf8.RuneCountInString(filetext) >= 50000+size {
|
|
|
return
|
|
|
}
|
|
|
|