Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/jfw/modules/pushent/src/followpush/push.go

@@ -296,7 +296,7 @@ func push(fid, sname, userId string, res *[]map[string]interface{}) {
 				}
 				setMap["a_relationinfo"] = relationinfoTemp
 			} else { //追加
-				(*updateMap)["$pushAll"] = bson.M{"a_relationinfo": pushArray}
+				(*updateMap)["$push"] = bson.M{"a_relationinfo": bson.M{"$each": pushArray}}
 			}
 			updateFlag = tools.MQFW.UpdateById(FOLLOW_COLLECTION, fid, updateMap)
 		}

src/jfw/modules/pushproject/src/followpush/push.go

@@ -394,7 +394,7 @@ func push(fid interface{}, sname, scode, title, userId string, res *[]map[string
 						}
 						setMap["a_relationinfo"] = relationinfoTemp
 					} else { //追加
-						(*updateMap)["$pushAll"] = bson.M{"a_relationinfo": pushArray}
+						(*updateMap)["$push"] = bson.M{"a_relationinfo": bson.M{"$each": pushArray}}
 					}
 					updateFlag = tools.MQFW.Update(FOLLOW_COLLECTION, &bson.M{"_id": fid}, updateMap, false, false)
 				}

src/jfw/modules/pushsubscribe/src/push/job/movejob.go

@@ -2,7 +2,6 @@
 package job
 
 import (
-	"log"
 	. "public"
 	. "push/config"
 	putil "push/util"
@@ -172,7 +171,6 @@ func (m *MoveJob) merge(number *int, nowUnix int64, moveUsers map[string]*MoveUs
 					newList = append(newList, vv)
 				}
 				pLength := len(newList)
-				log.Println(pLength)
 				if pLength == 0 {
 					invalidArray_delete = append(invalidArray_delete, moveUser.ids...)
 					if len(invalidArray_delete) == BigBulkSize {
@@ -193,8 +191,10 @@ func (m *MoveJob) merge(number *int, nowUnix int64, moveUsers map[string]*MoveUs
 					setMap["size"] = maxPushSize
 				} else { //追加
 					setMap["size"] = rLength + pLength
-					upSet["$pushAll"] = map[string]interface{}{
-						"list": newList,
+					upSet["$push"] = map[string]interface{}{
+						"list": map[string]interface{}{
+							"$each": newList,
+						},
 					}
 				}
 				upSet["$set"] = setMap

src/jfw/modules/pushsubscribe/src/push/pusher/normalpush.go

@@ -182,8 +182,10 @@ func (n *NormalPush) vipTempSave(u *UserInfo, pushParam *putil.PushParam) {
 				}
 				set["list"] = oldList
 			} else { //追加
-				upSet["$pushAll"] = map[string]interface{}{
-					"list": pushParam.Infos,
+				upSet["$push"] = map[string]interface{}{
+					"list": map[string]interface{}{
+						"$each": pushParam.Infos,
+					},
 				}
 			}
 		}