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

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

@@ -98,7 +98,7 @@ func (p *PushJob) Move(taskType int) {
 		"timestamp": map[string]interface{}{
 			"$lt": nowUnix,
 		},
-	}).Sort("_id").Iter()
+	}).Sort("userid").Iter()
 	moves := map[string]*Move{}
 	logger.Info("推送任务", taskType, "开始遍历pushspace_temp")
 	index, number, length := 0, 0, 0
@@ -274,15 +274,27 @@ func (p *PushJob) UpdateBulk(sess *mgo.Session, array_q, array_s *[]map[string]i
 }
 func (p *PushJob) DelBulk(sess *mgo.Session, array *[]interface{}) {
 	coll := sess.DB(DbName).C("pushspace_temp")
+	count := 0
 	bulk := coll.Bulk()
 	for _, v := range *array {
+		count++
 		bulk.Remove(map[string]interface{}{
 			"_id": v,
 		})
+		if count == BulkSize {
+			_, err := bulk.Run()
+			if nil != err {
+				logger.Info("DelBulkError", err)
+			}
+			count = 0
+			bulk = coll.Bulk()
+		}
 	}
-	_, err := bulk.Run()
-	if nil != err {
-		logger.Info("DelBulkError", err)
+	if count > 0 {
+		_, err := bulk.Run()
+		if nil != err {
+			logger.Info("DelBulkError", err)
+		}
 	}
 	*array = []interface{}{}
 }

src/web/templates/pc/landingpage.html

@@ -80,14 +80,15 @@
 <div id="pcld">
 	<div id="nav">
 		<div class="w">
-			<a target=_blank href="/"><img class="logo" src="{{Msg "seo" "cdn"}}/landingpage/pc/image/logo.png"/></a>
+			<a target=_blank href="/"><img class="logo" src="{{Msg "seo" "cdn"}}/landingpage/pc/image/logo.png?v={{Msg "seo" "version"}}"/></a>
 <!--			<a class="fr login" href="#">登录</a>-->
 			<div class='useronline' id="login" style="float:right;" onclick="_czc.push(['_trackEvent', '导航统计', '登录', 'useronline'])"></div>
-			<ul class="navList fr" style="width:400px;">
+			<ul class="navList fr" style="width:480px;">
 				<li style="float: left;"><a onclick="_czc.push(['_trackEvent', '导航统计', '首页', 'navList'])" target=_blank href="/">首页</a></li>
 				<li style="float: left;"><a onclick="_czc.push(['_trackEvent', '导航统计', '招标订阅', 'navList'])" target=_blank href="/front/subscribe.html">招标订阅</a></li>
 				<li style="float: left;"><a onclick="_czc.push(['_trackEvent', '导航统计', '拟建项目', 'navList'])" target=_blank href="/jylab/supsearch/proposedProject.html">拟建项目</a></li>
 				<li style="float: left;"><a onclick="_czc.push(['_trackEvent', '导航统计', '招标搜索', 'navList'])" target=_blank href="/jylab/supsearch/index.html">招标搜索</a></li>
+				<li style="float: left;"><a onclick="_czc.push(['_trackEvent', '导航统计', '数据导出', 'navList'])" target=_blank href="/front/dataExport/toSieve">数据导出</a></li>
 				<li style="float: left;"><a onclick="_czc.push(['_trackEvent', '导航统计', '开放平台', 'navList'])" target=_blank href="https://open.jianyu360.com/">开放平台</a></li>
 			</ul>
 		</div>