Merge branch 'release_1.3_20160104' of 192.168.3.17:zhanghongbo/qfw into release_1.3_20160104

common/src/qfw/util/elastic/elasticutil_test.go

@@ -180,6 +180,6 @@ func Test_first(t *testing.T) {
 
 func Test_date(t *testing.T) {
 	//"1448267541"
-	time.Now()
-	log.Println(time.Now().Unix())
+	s := time.Now().UnixNano()
+	log.Println(s, time.Now().Unix(), fmt.Sprintf("%d", s)[4:12], 999999/60/60)
 }

push/src/qfw/push/bid/bidpushjob.go

@@ -120,7 +120,7 @@ func send(k *push.MemberInterest, v *list.List, now time.Time, nowtime string) {
 		}
 	}()
 	//wxstr := ""
-	str := fmt.Sprintf("<div>根据您设置的关键词（%s）,给您推送以下信息:</div>", strings.Join(k.Interest, " "))
+	str := fmt.Sprintf("<div>根据您设置的关键词（%s）,给您推送以下信息:</div>", strings.Join(k.Interest, ";"))
 
 	//发送内容组合
 	i := 0
@@ -143,7 +143,7 @@ func send(k *push.MemberInterest, v *list.List, now time.Time, nowtime string) {
 		}
 
 	}
-	TITLE := TITLEA + fmt.Sprintf("%d条,关键词（%s）", i, strings.Join(k.Interest, ","))
+	TITLE := TITLEA + fmt.Sprintf("%d条,关键词（%s）", i, strings.Join(k.Interest, ";"))
 	WXTitle := fmt.Sprintf("%s《%s》%s", func() string {
 		minute := now.Unix() - lastInfoDate
 		if minute > -1 && minute < 61 {
@@ -196,7 +196,7 @@ func sendWeixin(k *push.MemberInterest, TITLE, str, nowtime, wxstr string, now t
 		"a_publishtime": publishTimes,
 	}
 	wid := mongodb.Save("wxpush", &wxpush)
-	wxstr = "\n点击下方“详情”查看详细信息。\n以上中标信息，是剑鱼根据关键字“" + strings.Join(k.Interest, " ") + "”奋力查找并推送，如不合您心意，请猛戳企明星菜单“会员服务—剑鱼”进行修改。"
+	wxstr = "\n点击下方“详情”查看详细信息。\n以上中标信息，是剑鱼根据关键字“" + strings.Join(k.Interest, ";") + "”奋力查找并推送，如不合您心意，请猛戳企明星菜单“会员服务—剑鱼”进行修改。"
 
 	wxDate := ""
 	if k.InterestDate > 0 {

push/src/qfw/push/tender/tenderpushjob.go

@@ -119,7 +119,7 @@ func send(k *push.MemberInterest, v *list.List, now time.Time, nowtime string) {
 	}()
 
 	//wxstr := ""
-	str := fmt.Sprintf("<div>根据您设置的关键词（%s）,给您推送以下信息:</div>", strings.Join(k.Interest, " "))
+	str := fmt.Sprintf("<div>根据您设置的关键词（%s）,给您推送以下信息:</div>", strings.Join(k.Interest, ";"))
 	//发送内容组合
 	i := 0
 	lastInfoDate := int64(0)
@@ -140,7 +140,7 @@ func send(k *push.MemberInterest, v *list.List, now time.Time, nowtime string) {
 		}
 
 	}
-	TITLE := TITLEA + fmt.Sprintf("%d条,关键词（%s）", i, strings.Join(k.Interest, " "))
+	TITLE := TITLEA + fmt.Sprintf("%d条,关键词（%s）", i, strings.Join(k.Interest, ";"))
 	WXTitle := fmt.Sprintf("%s《%s》%s", func() string {
 		minute := now.Unix() - lastInfoDate
 		if minute > -1 && minute < 61 {
@@ -204,7 +204,7 @@ func sendWeixin(k *push.MemberInterest, TITLE, str, nowtime, wxstr string, now t
 		wxDate = time.Now().Local().Add(time.Duration(-n2) * time.Second).Add(time.Duration(-n1*24) * time.Hour).Format(util.Date_Full_Layout)
 	}
 
-	wxstr = "\n点击下方“详情”查看详细信息。\n以上招标信息，是剑鱼根据关键字“" + strings.Join(k.Interest, " ") + "”奋力查找并推送，如不合您心意，请猛戳企明星菜单“会员服务—剑鱼”进行修改。"
+	wxstr = "\n点击下方“详情”查看详细信息。\n以上招标信息，是剑鱼根据关键字“" + strings.Join(k.Interest, ";") + "”奋力查找并推送，如不合您心意，请猛戳企明星菜单“会员服务—剑鱼”进行修改。"
 	push.SendWinXin(&qrpc.NotifyMsg{
 		Openid:  k.Openid,
 		Title:   push.PushConfig["tenderTitle"].(string),