Merge remote-tracking branch 'origin/dev3.6' into dev3.6

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

@@ -153,6 +153,7 @@ func (l *Login) Login() error {
 			}
 			return 0
 		} else if reqType == "identCodeLogin" {
+			disWord := l.GetString("disWord")
 			phone, _ := l.GetSession("identCodeKey").(string)
 			if phone == "" || l.GetSession("identCodeValue") == nil || l.GetString("identCode") != l.GetSession("identCodeValue") { //验证码不正确
 				return -1
@@ -193,9 +194,26 @@ 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)
+						addr := config.Sysconfig["nsq"].(string)
+						if disWord != "" {
+							redisDis := redis.GetStr("other", "DIS_"+disWord[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队列写入失败-->", err, 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队列写入失败-->", err, jy.Jywx_subscribe_invited, _id)
+								}
+							}
+						} else {
+							err := jy.Publish(public.Mgo_Log, addr, jy.Jyapp_phone_register, _id, jy.Jyapp_node1)
+							if err != nil {
+								log.Println("nsq队列写入失败-->", err, jy.Jyapp_phone_register, _id)
+							}
 						}
 						return 1
 					}
@@ -328,13 +346,18 @@ var RegMap = map[string]*RegStruct{}
 //app注册保存
 func (l *Login) Register() error {
 	defer qutil.Catch()
+	disWord := l.GetString("disWord")
 	if l.Method() == "GET" {
+		// if disWord != "" {
+		// 	l.T["disWord"] = disWord
+		// }
 		if l.GetString("step") == "2" {
 			if l.GetSession("registerStep") == "2" {
+				fmt.Println("1")
 				return l.Render("/me/setpwd.html")
 			}
 		}
-		return l.Render("/me/register.html")
+		return l.Render("/me/register.html", &l.T)
 	}
 	returnSign := ""
 	status := func() string {
@@ -426,6 +449,27 @@ func (l *Login) Register() error {
 					saveSuccess = saveid != ""
 				}
 				if saveSuccess {
+					addr := config.Sysconfig["nsq"].(string)
+					if disWord != "" {
+						redisDis := redis.GetStr("other", "DIS_"+disWord[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队列写入失败-->", err, jy.Jywx_subscribe_invite, fromUserId)
+							}
+							err = jy.Publish(public.Mgo_Log, addr, jy.Jywx_subscribe_invited, saveid, jy.Jyapp_node1)
+							if err != nil {
+								log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invited, saveid)
+							}
+						}
+					} else {
+						err := jy.Publish(public.Mgo_Log, addr, jy.Jyapp_phone_register, saveid, jy.Jyapp_node1)
+						if err != nil {
+							log.Println("nsq队列写入失败-->", err, jy.Jyapp_phone_register, saveid)
+						}
+					}
 					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)

src/jfw/modules/app/src/web/templates/me/login.html

@@ -161,7 +161,11 @@
 				if($(this).index() == 0){
 					window.location.href = "/jyapp/free/forgetPwd";
 				}else{
-					window.location.href = "/jyapp/free/register";
+          var href ="/jyapp/free/register";
+          if (disWord!=null){
+          sessionStorage.setItem("disWord_reg",disWord)
+          }
+					window.location.href = href;
 				}
 			});
 			$(".header-tab>i").css("left",left_1);
@@ -309,7 +313,7 @@
 							}
 						});
 					}else{
-						$.post("/jyapp/free/login",{reqType:"identCodeLogin",phone:phone,identCode:$("#identCode").val(),rid:JyObj.getPushRid(),oid:getOtherPushId(),phoneType:getPhoneType(),channel:getChannel(),deviceId:getDeviceId()},function(r){
+						$.post("/jyapp/free/login",{reqType:"identCodeLogin",phone:phone,identCode:$("#identCode").val(),rid:JyObj.getPushRid(),oid:getOtherPushId(),phoneType:getPhoneType(),channel:getChannel(),deviceId:getDeviceId(),disWord:disWord},function(r){
 							if(r.status==1){
 								if(localStorage){
 									localStorage.loginPhone = phone;

src/jfw/modules/app/src/web/templates/me/register.html

@@ -384,7 +384,13 @@
 							},2000)
 							return
 						}
-						window.location.href = "/jyapp/free/register?step=2&entname="+s_company;
+            var href ="/jyapp/free/register?step=2&entname="+s_company;
+              var disWord =sessionStorage.getItem("disWord_reg");
+            if (disWord){
+              sessionStorage.removeItem("disWord_reg");
+              href +="/jyapp/free/register?step=2&entname="+s_company +"&disWord="+disWord;
+            }
+						window.location.href = href;
 					}
 				});
 			});

src/jfw/modules/app/src/web/templates/me/setpwd.html

@@ -44,6 +44,7 @@
 			var tout = null;
 			var isIos = mySysIsIos();
 			var pwdfocusindex = -1;
+      var disWord = getParam("disWord");
 			$(function() {
 				//点击返回上一页
 				$("#header a").on("tap",function(){
@@ -116,7 +117,7 @@
           $.ajax({
     				url: "/jyapp/free/register",
     				type: "post",
-    				data: {reqType:"save",password:$(".onePass input").val(),rid:JyObj.getPushRid(),oid:getOtherPushId(),phoneType:getPhoneType(),channel:getChannel(),deviceId:getDeviceId(),s_entname:entname},
+    				data: {reqType:"save",password:$(".onePass input").val(),rid:JyObj.getPushRid(),oid:getOtherPushId(),phoneType:getPhoneType(),channel:getChannel(),deviceId:getDeviceId(),s_entname:entname,disWord:disWord},
     				dataType: "json",
     				success: function(r){
   						var url = null;

src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -162,14 +162,11 @@ func (p *CommonAction) IsPaySuccess() {
 func (d *CommonAction) GetwxSdkSign() {
 	var sign []string
 	url := d.GetString("url")
-	openId, _ := d.GetSession("s_m_openid").(string)
 	if url != "" {
 		sign = SignJSSDK(url)
 	}
 	d.ServeJson(map[string]interface{}{
-		"wxsdk":     sign,
-		"openid":    se.EncodeString(openId),
-		"webdomain": config.Config.WebDomain,
+		"wxsdk": sign,
 	})
 }
 

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -7,9 +7,6 @@ import (
 	"database/sql"
 	"encoding/base64"
 	"fmt"
-	"github.com/dchest/captcha"
-	"github.com/go-xweb/httpsession"
-	"github.com/go-xweb/xweb"
 	"log"
 	qutil "qfw/util"
 	"qfw/util/elastic"
@@ -18,6 +15,10 @@ import (
 	"strings"
 	"time"
 	"util"
+
+	"github.com/dchest/captcha"
+	"github.com/go-xweb/httpsession"
+	"github.com/go-xweb/xweb"
 )
 
 type UserAccount struct {
@@ -35,6 +36,7 @@ type UserAccount struct {
 	wxUnBind           xweb.Mapper `xweb:"/user/weixin/unBind"`             //我的页面-微信解绑(app端)
 	companyAssociation xweb.Mapper `xweb:"/user/company/association"`       //公司名称联想
 	setCompany         xweb.Mapper `xweb:"/user/company/set"`               //我的页面-更改公司名称
+	shareUserId        xweb.Mapper `xweb:"/user/shareUserid"`
 }
 
 var (
@@ -645,6 +647,21 @@ func (this *UserAccount) WxUnBind() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
+func (u *UserAccount) ShareUserId() {
+	userId, _ := u.GetSession("userId").(string)
+	log.Println(userId)
+	rData, errMsg := func() (interface{}, error) {
+		if userId == "" {
+			return nil, DBQUERY_ERROR
+		}
+		return map[string]interface{}{
+			"shareUserId": qutil.SE.EncodeStringByCheck(userId),
+			"webdomain":   config.Config.WebDomain,
+		}, nil
+	}()
+	u.ServeJson(NewResult(rData, errMsg))
+}
+
 //util---------------------------------
 
 //图形验证码校验