更新

src/jfw/front/websocket.go

@@ -43,7 +43,7 @@ func ServeWss(w http.ResponseWriter, r *http.Request) {
 	for {
 		time.Sleep(1 * time.Second)
 		if shareIds == "close" {
-			log.Println("！！！！socket关闭！！！退出循环")
+			//log.Println("！！！！socket关闭！！！退出循环")
 			conn.Close()
 			return
 		} else if shareIds == "" {
@@ -53,7 +53,7 @@ func ServeWss(w http.ResponseWriter, r *http.Request) {
 		if shareIds != "" && len(shareidlist) > 1 {
 			shareidnum := strings.Split(shareIds, "___")[0]
 			shareidkop := strings.Split(shareIds, "___")[1]
-			log.Println(se.DecodeString(shareidnum) + "--1--" + se.DecodeString(shareidkop))
+			//log.Println(se.DecodeString(shareidnum) + "--1--" + se.DecodeString(shareidkop))
 			shareid = shareidnum
 			openid = redis.GetStr("sso", "p_usershare_"+se.DecodeString(shareidnum))
 			if openid == "" {

src/jfw/jyutil/jyutil.go

@@ -49,18 +49,18 @@ func FindMyShareId(activecode, openid string) string {
 			//			}
 			//			id := GetShareId(TYPE_INVITE)
 			//			tools.GetShareQR(id)
-			//			shareid = fmt.Sprintf("%d", id)
 			var shareData = make(map[string]interface{})
 			shareData["action"] = "32"
-			redis.Put("sso", "p_shareData_"+se.EncodeString(openid), shareData, 24*60*60)
 			data := make(map[string]interface{})
 			data["s_openid"] = openid
 			data["s_businesscode"] = activecode
-			data["i_shareid"] = se.EncodeString(openid)
+			data["i_shareid"] = se.EncodeString(openid + "---" + activecode)
 			data["l_timestamp"] = time.Now().Unix()
 			mongodb.Save("person_share", data)
+			shareid = fmt.Sprintf("%d", openid+"---"+activecode)
+			redis.Put("sso", "p_shareData_"+shareid, shareData, 24*60*60)
 		} else {
-			shareid = (*ret)["i_shareid"].(string)
+			shareid = se.DecodeString((*ret)["i_shareid"].(string))
 		}
 	}
 	return shareid

src/jfw/modules/weixin/src/wx/wx.go

@@ -411,9 +411,13 @@ func Subscribe(w ResponseWriter, r *Request) {
 	user, err := Mux.GetUserInfo(openid)
 	var source = ""
 	var pccodepre = ""
+	log.Println(strings.Split(r.EventKey, "_"), "绑定关系：", r.EventKey)
 	if len(strings.Split(r.EventKey, "_")) == 2 {
 		source = strings.Split(r.EventKey, "_")[1]
+	} else if len(strings.Split(r.EventKey, "_")) == 3 {
+		source = strings.SplitN(r.EventKey, "_", 2)[1]
 	}
+	log.Println(strings.SplitN(r.EventKey, "_", 2), ":----:", source)
 	shareData := redis.Get("sso", "p_shareData_"+source)
 	infoData := map[string]interface{}{}
 	tmp, _ := json.Marshal(shareData)
@@ -1113,19 +1117,20 @@ func SaveInviteLink(shareid string, myopenid string, isolduser bool) {
 		}
 	}
 	//找邀请人信息
-	ret, _ := tools.MQFW.FindOne("person_share", `{"i_shareid": "`+shareid+`"}`)
-	if *ret == nil {
-		log.Println("wu share info!!!!")
-		sharelock.Unlock()
-		return
-	}
-	source_opendid := (*ret)["s_openid"]
+	//ret, _ := tools.MQFW.FindOne("person_share", `{"i_shareid": "`+shareid+`"}`)
+	//if *ret == nil {
+	//	log.Println("wu share info!!!!")
+	//	sharelock.Unlock()
+	//	return
+	//}
+	log.Println("保存shareid：", shareid)
+	source_opendid := shareid //(*ret)["s_openid"]
 	data := map[string]interface{}{
 		"s_target_openid": myopenid,
 		"s_source_openid": source_opendid,
 		"l_timestamp":     time.Now().Unix(),
 		"i_shareid":       shareid,
-		"s_businesscode":  (*ret)["s_businesscode"],
+		//"s_businesscode":  (*ret)["s_businesscode"],
 	}
 	tools.MQFW.Save("person_invitelink", data)
 

src/seo.json

@@ -12,7 +12,7 @@
             "title": "招标搜索结果_剑鱼招标订阅，全行业招标信息智能推送领导者！"
         }
     },
-	"version":"1401",
+	"version":"1402",
 	"area":{
 		"QG":{
 				"NAME":"全国",

src/web/staticres/wxswordfish/share.js

@@ -1,6 +1,6 @@
 function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 	var myloc = window.location.host;
-	myloc="https://"+myloc;
+	myloc="http://"+myloc;
 	activecode=activecode||""
 	if(typeof(openid) == "undefined" || openid == null || openid == ""){
 		openid = "-1";