Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

weixin/src/qfw/weixin/dao/sharedao.go

@@ -8,6 +8,7 @@ import (
 	"qfw/util/credit"
 	. "qfw/util/mongodb"
 	"sync"
+	"qfw/util"
 	"time"
 )
 
@@ -58,8 +59,11 @@ func SaveInviteLink(shareid string, myopenid string,isolduser bool) {
 	}
 	smid := fmt.Sprintf("%x", string(((*ret)["_id"]).(ObjectId)))
 	//积分处理,RPC
-	log.Println("smid:::", smid)
-	credit.InCreditB(smid, credit.C_TG, nil)
+	 util.Try(func() {
+				credit.InCreditB(smid, credit.C_TG, nil)
+			}, func(e interface{}) {
+				log.Println(e)
+			})
 	sharelock.Unlock()
 }
 

weixin/src/qfw/weixin/menu.go

@@ -46,7 +46,7 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	menu.Buttons[2].SubButtons[2].Name = "法规查询"
 	menu.Buttons[2].SubButtons[2].Type = MenuButtonTypeUrl
 	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "lawsearchaction")
-	menu.Buttons[2].SubButtons[3].Name = "签到"
+	menu.Buttons[2].SubButtons[3].Name = "我的积分/签到"
 	menu.Buttons[2].SubButtons[3].Type = MenuButtonTypeUrl
 	menu.Buttons[2].SubButtons[3].Url = fmt.Sprintf(urlstr, "signature")
 

weixin/src/qfw/weixin/msgaction.go

@@ -0,0 +1,32 @@
+package weixin
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+)
+
+const (
+	PREVIEW_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/preview?access_token="
+)
+
+//发红包(传统红包)
+func SendMsgAct(w http.ResponseWriter, r *http.Request) {
+	openid := r.FormValue("openid")
+	var msg struct {
+		ToUser string `json:"touser"`
+		Text   struct {
+			Content string `json:"content"`
+		} `json:"text"`
+		Msgtype string `json:"msgtype"`
+	}
+	msg.ToUser = openid
+	msg.Text.Content = fmt.Sprintf("<a href=\"%s\"><font color=red>%s</font></a>", "http://118.85.207.82/wx/czwap/person.do?phone=jfcpeeccfjgfokhfpmodakliicpeleek&toUserName=gh_aa76902ce7c6&openId=okAaojvZL77PDmx51yGZeGQbG8m8", "电信")
+	msg.Msgtype = "text"
+	bs, err := Mux.PostJsonCustom(PREVIEW_URL, msg)
+	if err != nil {
+		log.Println("preview msg::", err.Error())
+	} else {
+		log.Println("preview msg::", string(bs))
+	}
+}

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -65,9 +65,13 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		w.ReplyText("嗨，小星来陪你解闷。有什么开心的，不开心的说说来，大伙乐呵乐呵。\n输入q或Q离开。")
 		return
 	} else if r.Content == "抽奖" { //进入抽奖环节
-		//w.ReplyText("非常抱歉！系统维护中，请稍后再试。")
-		targeturl := fmt.Sprintf("http://%s/activity/%s/%s", wf.SysConfig.Domain, wf.SysConfig.Activity["activitycode"], se.EncodeString(r.FromUserName))
-		w.ReplyNews([]Article{Article{PicUrl: wf.SysConfig.Activity["picurl"], Title: wf.SysConfig.Activity["title"], Url: targeturl}})
+		if time.Now().Unix() > 1455465600 { //活动过期 ，过期后，这段代码要删除
+			//TODO
+			w.ReplyText("抱歉，活动已结束！敬请期待下一次抽奖活动，注意看预告哟……")
+		} else {
+			targeturl := fmt.Sprintf("http://%s/activity/%s/%s", wf.SysConfig.Domain, wf.SysConfig.Activity["activitycode"], se.EncodeString(r.FromUserName))
+			w.ReplyNews([]Article{Article{PicUrl: wf.SysConfig.Activity["picurl"], Title: wf.SysConfig.Activity["title"], Url: targeturl}})
+		}
 	} else if strings.HasPrefix(r.Content, "内部报名") { //绑定拓普员工姓名
 		tmp := strings.Fields(r.Content)
 		//log.Println(tmp, len(tmp))
@@ -224,3 +228,4 @@ func processRobotMsg(userid string, content string, w ResponseWriter, r *Request
 		return
 	}
 }
+

weixin/src/qfw/weixin/weixin.go

@@ -52,7 +52,7 @@ func InitWeixinSdk() {
 	http.HandleFunc("/"+wf.SysConfig.Appcontext+"/recharge", RechargeAct)
 	http.HandleFunc("/"+wf.SysConfig.Appcontext+"/paycallback", PayCallback)
 	//监控
-
+	http.HandleFunc("/"+wf.SysConfig.Appcontext+"/sendmsg", SendMsgAct)
 	//生成推广二维码
 	http.HandleFunc("/"+wf.SysConfig.Appcontext+"/adv/", AdvHandle)