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

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

@@ -106,7 +106,7 @@ func (m *MoveJob) Execute() {
 		}(data)
 		data = make(map[string]interface{})
 		if index%500 == 0 {
-			logger.Info("迁移数据", index)
+			logger.Info("迁移数据：", index)
 		}
 	}
 	m.moveWait.Wait()

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

@@ -35,6 +35,7 @@ func (p *ProjectPushJob) Execute() {
 	for {
 		batchIndex++
 		batchCount, datas := p.loadPushspace_project(batchIndex, &startId)
+		logger.Info("开始第", batchIndex, "次关联项目匹配。。。")
 		index := 0
 		for k, v := range *datas {
 			p.pushPool <- true
@@ -172,11 +173,11 @@ func (p *ProjectPushJob) Execute() {
 			}(k, v)
 			index++
 			if index%500 == 0 {
-				logger.Info("第", batchIndex, "次关联项目匹配", index)
+				logger.Info("第", batchIndex, "次关联项目匹配：", index)
 			}
 		}
 		p.pushWait.Wait()
-		logger.Info("第", batchIndex, "次关联项目匹配", index)
+		logger.Info("第", batchIndex, "次关联项目匹配结束", index)
 		if batchCount < Config.PushBatch {
 			break
 		}
@@ -277,7 +278,7 @@ func (p *ProjectPushJob) loadProject() *sync.Map {
 		m = make(map[string]interface{})
 		index++
 		if index%500 == 0 {
-			logger.Info("加载项目", index)
+			logger.Info("加载项目：", index)
 		}
 	}
 	p.loadWait.Wait()

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

@@ -58,6 +58,9 @@ func (s *SpecialPush) GetUserInfo(user map[string]interface{}) (*UserInfo, *puti
 		return nil, nil
 	}
 	userInfo, _ := NewUserInfoByUserColl(u)
+	if userInfo == nil {
+		return nil, nil
+	}
 	if !IsVipUser(userInfo.VipStatus) {
 		logger.Info(userId, "已经不是vip用户了", userInfo.VipStatus)
 		s.deletePushspaceVip(user)