xiugai

src/jfw/front/login.go

@@ -121,7 +121,7 @@ func (l *Login) Login() error {
 						fmt.Println(nsqPath)
 						er := jy.Publish(public.Mgo_Log, nsqPath, jy.Jypc_phone_register, _id, jy.Jyweb_node2)
 						if er != nil {
-							log.Println("调用nsq失败:", er, "用户id:", _id, "事件:", jy.Jypc_phone_register)
+							log.Println("nsq队列写入失败-->", jy.Jypc_phone_register, _id)
 						}
 						if ok {
 							result["userInfo"] = userInfo

src/jfw/front/shorturl.go

@@ -13,7 +13,7 @@ import (
 	"net/url"
 	"qfw/util"
 
-	// "qfw/util/jy"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"regexp"
 	"strconv"
@@ -179,9 +179,6 @@ func (s *Short) Article(stype, id string) error {
 	}
 	isVip := util.IntAll((*res)["i_vip_status"]) == 1 || util.IntAll((*res)["i_vip_status"]) == 2
 	s.T["isVip"] = isVip
-	if from_userid != "" { //分享开打的
-		//jy.Publish(public.Mgo_Log, config.Sysconfig["nsq"].(string), jy.Jyweb_article_open, jy.Jywx_node1)
-	}
 	if bm {
 		//判断有没有取关，取关的话，跳转到关于剑鱼标讯页面
 		if ssOpenid != nil && ssOpenid != "" {
@@ -254,7 +251,20 @@ func (s *Short) Article(stype, id string) error {
 			// 		rec = "_rec"
 			// 	}
 			// }
-			s.T["forceShareFlag"] = public.CheckUserNeedForceShare(userId, public.ShareType_detail) //是否强制分享
+			s.T["forceShareFlag"] = public.CheckUserNeedForceShare(userId, public.ShareType_detail)     //是否强制分享
+			if from_userid != "" && from_userid != userId && util.ObjToString(obj["subtype"]) != "拟建" { //分享开打的
+				article_id := util.CommonDecodeArticle(stype, id)[0]
+				if redis.Get("other", fmt.Sprintf("integral_article_%s_%s", from_userid, article_id)) == nil {
+					fmt.Println("from_userid", se.DecodeStringByCheck(from_userid))
+					err := jy.Publish(public.Mgo_Log, config.Sysconfig["nsq"].(string), jy.Jyweb_article_open, se.DecodeStringByCheck(from_userid), jy.Jywx_node1)
+					if err != nil {
+						log.Println("nsq队列写入失败-->", jy.Jyweb_article_open, se.DecodeStringByCheck(from_userid))
+					} else {
+						//integral_article_ +userId+ 三级页id
+						redis.Put("other", fmt.Sprintf("integral_article_%s_%s", from_userid, article_id), "1", 60*60*24)
+					}
+				}
+			}
 			content, _ := s.Render4Cache("/weixin/wxinfocontent"+rec+".html", &s.T)
 			// 	redis.Put("other", "jywxdetail_"+sid+kds, string(content), 60*60*2)
 			return s.SetBody(content)

src/jfw/modules/app/src/app/front/login.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"jfw/config"
+	"jfw/public"
 	"log"
 	. "mongodb"
 	"net/http"
@@ -192,6 +193,10 @@ func (l *Login) Login() error {
 					if _id != "" {
 						jy.ClearPhoneIdentSession(l.Session())
 						returnSign = afterLogin(data, l.Session(), rid, oid, phoneType, channel, deviceId, 1, true)
+						err := jy.Publish(public.Mgo_Log, config.Sysconfig["nsq"].(string), jy.Jyapp_phone_register, _id, jy.Jyapp_node1)
+						if err != nil {
+							log.Println("nsq队列写入失败-->", jy.Jyapp_wx_register, _id)
+						}
 						return 1
 					}
 				} else {
@@ -380,6 +385,7 @@ func (l *Login) Register() error {
 				if userIsExists(phone) { //用户已存在
 					return "userExists"
 				}
+				saveid := ""
 				rid := l.GetString("rid")
 				oid := l.GetString("oid")
 				phoneType := l.GetString("phoneType")
@@ -416,9 +422,14 @@ func (l *Login) Register() error {
 						"l_modifydate": time.Now().Unix(),
 					}
 					data["s_regsource"] = isAndroidOrIOS(l.Header("User-Agent"))
-					saveSuccess = mongodb.Save("user", data) != ""
+					saveid = mongodb.Save("user", data)
+					saveSuccess = saveid != ""
 				}
 				if saveSuccess {
+					err := jy.Publish(public.Mgo_Log, config.Sysconfig["nsq"].(string), jy.Jyapp_phone_register, saveid, jy.Jyapp_node1)
+					if err != nil {
+						log.Println("nsq队列写入失败-->", jy.Jyapp_wx_register, saveid)
+					}
 					l.DelSession("registerStep")
 					jy.ClearPhoneIdentSession(l.Session())
 					returnSign = afterLogin(data, l.Session(), rid, oid, phoneType, channel, deviceId, 1, true)
@@ -446,18 +457,6 @@ func (l *Login) WxLogin() {
 	// userid := l.GetSession("userId").(string)
 	addr := config.Sysconfig["nsq"].(string)
 	disWord := l.GetString("disWord")
-	if disWord != "" {
-		redisDis := redis.GetStr("other", "DIS_"+disWord[1:])
-		fmt.Println(redisDis, strings.Split(redisDis, "##")[1])
-		if redisDisArr := strings.Split(redisDis, "##"); len(redisDisArr) > 1 {
-			fromUserId := redisDisArr[1]
-			fmt.Println("fron:", fromUserId)
-			err := jy.Publish(2, addr, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1)
-			if err != nil {
-				log.Println("nsq队列写入失败-->", jy.Jyapp_wx_register, fromUserId)
-			}
-		}
-	}
 	defer qutil.Catch()
 	returnSign := ""
 	status := func() int {
@@ -523,7 +522,6 @@ func (l *Login) WxLogin() {
 			returnSign = afterLogin(*user, l.Session(), rid, oid, phoneType, channel, deviceId, 2, false)
 			return 1
 		} else {
-			fmt.Println(l.GetString("disWord"))
 			//创建新用户
 			newUser := map[string]interface{}{
 				"s_jpushid":      rid,
@@ -549,8 +547,28 @@ func (l *Login) WxLogin() {
 				},
 			}
 			newUser["s_regsource"] = isAndroidOrIOS(l.Header("User-Agent"))
-			if mongodb.Save("user", newUser) != "" {
+			if _id := mongodb.Save("user", newUser); _id != "" {
 				returnSign = afterLogin(newUser, l.Session(), rid, oid, phoneType, channel, deviceId, 2, true)
+				if disWord != "" {
+					redisDis := redis.GetStr("other", "DIS_"+disWord[1:])
+					fmt.Println(redisDis, strings.Split(redisDis, "##")[1])
+					if redisDisArr := strings.Split(redisDis, "##"); len(redisDisArr) > 1 {
+						fromUserId := redisDisArr[1]
+						err := jy.Publish(public.Mgo_Log, addr, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1)
+						if err != nil {
+							log.Println("nsq队列写入失败-->", jy.Jywx_subscribe_invite, fromUserId)
+						}
+						err = jy.Publish(public.Mgo_Log, addr, jy.Jywx_subscribe_invited, _id, jy.Jyapp_node1)
+						if err != nil {
+							log.Println("nsq队列写入失败-->", jy.Jywx_subscribe_invited, _id)
+						}
+					}
+				} else {
+					err = jy.Publish(public.Mgo_Log, addr, jy.Jyapp_wx_register, _id, jy.Jyapp_node1)
+					if err != nil {
+						log.Println("nsq队列写入失败-->", jy.Jyapp_wx_register, _id)
+					}
+				}
 				return 1
 			}
 		}