Browse Source

fix:主程序session获取修改

duxin 1 year ago
parent
commit
a5b048467a

+ 7 - 12
src/jfw/front/applysub.go

@@ -36,7 +36,7 @@ func init() {
 	xweb.AddAction(&Applysub{})
 }
 
-//用户提交信息
+// 用户提交信息
 func (a *Applysub) SubInfo() error {
 	defer util.Catch()
 	var returnMap = map[string]interface{}{}
@@ -45,17 +45,18 @@ func (a *Applysub) SubInfo() error {
 	code := a.GetString("code")
 	phoneNum := a.GetString("phoneNum")
 	company := a.GetString("company")
-	openid := a.Session().Get("s_m_openid").(string)
+	getsession := a.Session().GetMultiple()
+	openid := getsession["s_m_openid"].(string)
 	userid := util.ObjToString(a.GetSession("userId"))
-	nickname := a.Session().Get("s_nickname").(string)
+	nickname := getsession["s_nickname"].(string)
 	var regPos = regexp.MustCompile("/^[0-9a-zA-Z]+$/")
 	if userid != "" {
 		var redissub = redis.GetStr("other", userid+"_applysubmit")
 		if redissub == "" {
 			redis.Put("other", userid+"_applysubmit", "T", 30)
 			if company != "" && !regPos.MatchString(company) || (len(company) < 4 && (company == "个体" || company == "个人")) {
-				if code == a.Session().Get("MsgCode").(string) {
-					if phoneNum == a.Session().Get("phoneNum").(string) {
+				if code == getsession["MsgCode"].(string) {
+					if phoneNum == getsession["phoneNum"].(string) {
 						cpy := []rune(company)
 						if len(cpy) > 50 {
 							company = string(cpy[:50])
@@ -70,7 +71,7 @@ func (a *Applysub) SubInfo() error {
 						id := mongodb.Save("applysub_user", applyinfo)
 						if len(id) > 0 {
 							returnMap["flag"] = true
-                            jyutil.Compatible.Update( userid, bson.M{"$set": bson.M{"i_applystatus": 1, "o_jy.i_ratemode": 2}})
+							jyutil.Compatible.Update(userid, bson.M{"$set": bson.M{"i_applystatus": 1, "o_jy.i_ratemode": 2}})
 						}
 					} else {
 						returnMap["msg"] = "请输入正确的手机号"
@@ -89,7 +90,6 @@ func (a *Applysub) SubInfo() error {
 	return nil
 }
 
-//
 func (a *Applysub) CheckCode() error {
 	defer util.Catch()
 	var returnMap = map[string]interface{}{}
@@ -103,7 +103,6 @@ func (a *Applysub) CheckCode() error {
 	return nil
 }
 
-//
 func (a *Applysub) SendMsg() error {
 	defer util.Catch()
 	userid := util.ObjToString(a.GetSession("userId"))
@@ -140,7 +139,6 @@ func (a *Applysub) SendMsg() error {
 	return nil
 }
 
-//
 func UserIsExists(phoneNum string) (exists bool) {
 	exists = false
 	query := map[string]interface{}{
@@ -153,7 +151,6 @@ func UserIsExists(phoneNum string) (exists bool) {
 	return
 }
 
-//
 func (a *Applysub) CheckPhoneNum() error {
 	defer util.Catch()
 	phoneNum := a.GetString("phoneNum")
@@ -193,7 +190,6 @@ func (a *Applysub) CheckPhoneNum() error {
 //	}
 //}
 
-//
 func (a *Applysub) Index() error {
 	defer util.Catch()
 	openid := util.ObjToString(a.GetSession("s_m_openid"))
@@ -223,7 +219,6 @@ func (a *Applysub) Index() error {
 	return a.Redirect("/front/downloadapppage/normal?source=weixinAutoRpl")
 }
 
-//
 func (a *Applysub) InfoPage() error {
 	defer util.Catch()
 	openid, _ := a.Session().Get("s_m_openid").(string)

+ 8 - 7
src/jfw/front/commonPayWx.go

@@ -95,7 +95,8 @@ func (w *WxPayCommon) PaySuccess(doType string) error {
 
 func (w *WxPayCommon) ToMyWxOrder() error {
 	defer util.Catch()
-	if w.Session().Get("userId") == nil {
+	getsession := w.Session().GetMultiple()
+	if getsession["userId"] == nil {
 		if w.GetString("state") == "wx" {
 			//微信跳回来的
 			code := w.GetString("code")
@@ -113,29 +114,29 @@ func (w *WxPayCommon) ToMyWxOrder() error {
 				return w.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(w.Site()+w.Url()), "wx"), 302)
 			}
 		}
-		userid := util.ObjToString(w.GetSession("userId"))
+		userid := util.ObjToString(getsession["userId"])
 		if userid == "" {
 			return errors.New("未登录")
 		}
 	}
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	return w.Render("/weixin/commonPay/myOrder.html", &w.T)
 }
 
-//公对公转账页面
+// 公对公转账页面
 func (this *WxPayCommon) TransferAccounts(doType string) error {
 	this.T["doType"] = doType
 	this.T["orderCode"] = this.GetString("orderCode")
 	return this.Render("/weixin/commonPay/transferAccounts.html", &this.T)
 }
 
-//对公转账提交成功页面
+// 对公转账提交成功页面
 func (this *WxPayCommon) AccountsResult(doType string) error {
 	this.T["doType"] = doType
 	this.T["orderCode"] = this.GetString("orderCode")

+ 20 - 17
src/jfw/front/distribution.go

@@ -30,11 +30,11 @@ func init() {
 	xweb.AddAction(&Distrib{})
 }
 
-//
 func (this *Distrib) LinkShare(discored string) error {
 	defer util.Catch()
 	checkIsSubscribeFlag := true
-	openid, _ := this.Session().Get("s_m_openid").(string)
+	getsession := this.Session().GetMultiple()
+	openid, _ := getsession["s_m_openid"].(string)
 	if openid == "" {
 		if this.GetString("state") == "wx" {
 			//微信跳回来的
@@ -56,7 +56,7 @@ func (this *Distrib) LinkShare(discored string) error {
 				return this.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(this.Site()+this.Url()), "wx"), 302)
 			}
 		}
-		openid, _ = this.Session().Get("s_m_openid").(string)
+		openid, _ = getsession["s_m_openid"].(string)
 		if openid == "" {
 			checkIsSubscribeFlag = false
 		}
@@ -65,7 +65,7 @@ func (this *Distrib) LinkShare(discored string) error {
 		checkIsSubscribeFlag = CheckUserIsSubscribe(openid)
 	}
 
-	userId, _ := this.Session().Get("userId").(string)
+	userId, _ := getsession["userId"].(string)
 	go this.ShareLogs(discored, userId)
 	if !checkIsSubscribeFlag {
 		if discored == "" {
@@ -78,11 +78,11 @@ func (this *Distrib) LinkShare(discored string) error {
 	return this.Redirect("/distribution/share/" + discored)
 }
 
-//
 func (this *Distrib) LinkShareX(discored string) error {
 	defer util.Catch()
 	checkIsSubscribeFlag := true
-	openid, _ := this.Session().Get("s_m_openid").(string)
+	getsession := this.Session().GetMultiple()
+	openid, _ := getsession["s_m_openid"].(string)
 	if openid == "" {
 		if this.GetString("state") == "wx" {
 			//微信跳回来的
@@ -104,7 +104,7 @@ func (this *Distrib) LinkShareX(discored string) error {
 				return this.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(this.Site()+this.Url()), "wx"), 302)
 			}
 		}
-		openid, _ = this.Session().Get("s_m_openid").(string)
+		openid, _ = getsession["s_m_openid"].(string)
 		if openid == "" {
 			checkIsSubscribeFlag = false
 		}
@@ -112,7 +112,7 @@ func (this *Distrib) LinkShareX(discored string) error {
 		//是否为关注用户
 		checkIsSubscribeFlag = CheckUserIsSubscribe(openid)
 	}
-	userId, _ := this.Session().Get("userId").(string)
+	userId, _ := getsession["userId"].(string)
 	go this.ShareLogs(discored, userId)
 	if !checkIsSubscribeFlag {
 		if discored == "" {
@@ -125,11 +125,12 @@ func (this *Distrib) LinkShareX(discored string) error {
 	return this.Redirect("/distribution/share/" + discored)
 }
 
-//企业分销
+// 企业分销
 func (this *Distrib) LinkShareG(discored string) error {
 	defer util.Catch()
 	checkIsSubscribeFlag := true
-	openid, _ := this.Session().Get("s_m_openid").(string)
+	getsession := this.Session().GetMultiple()
+	openid, _ := getsession["s_m_openid"].(string)
 	if openid == "" {
 		if this.GetString("state") == "wx" {
 			//微信跳回来的
@@ -151,7 +152,8 @@ func (this *Distrib) LinkShareG(discored string) error {
 				return this.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(this.Site()+this.Url()), "wx"), 302)
 			}
 		}
-		openid, _ = this.Session().Get("s_m_openid").(string)
+
+		openid, _ = getsession["s_m_openid"].(string)
 		if openid == "" {
 			checkIsSubscribeFlag = false
 		}
@@ -160,7 +162,7 @@ func (this *Distrib) LinkShareG(discored string) error {
 		checkIsSubscribeFlag = CheckUserIsSubscribe(openid)
 	}
 
-	userId, _ := this.Session().Get("userId").(string)
+	userId, _ := getsession["userId"].(string)
 	go this.ShareLogs(discored, userId)
 	if !checkIsSubscribeFlag {
 		if discored == "" {
@@ -173,11 +175,12 @@ func (this *Distrib) LinkShareG(discored string) error {
 	return this.Redirect("/distribution/share/" + discored)
 }
 
-//企业分销
+// 企业分销
 func (this *Distrib) LinkShareE(discored string) error {
 	defer util.Catch()
 	checkIsSubscribeFlag := true
-	openid, _ := this.Session().Get("s_m_openid").(string)
+	getsession := this.Session().GetMultiple()
+	openid, _ := getsession["s_m_openid"].(string)
 	if openid == "" {
 		if this.GetString("state") == "wx" {
 			//微信跳回来的
@@ -199,7 +202,7 @@ func (this *Distrib) LinkShareE(discored string) error {
 				return this.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(this.Site()+this.Url()), "wx"), 302)
 			}
 		}
-		openid, _ = this.Session().Get("s_m_openid").(string)
+		openid, _ = getsession["s_m_openid"].(string)
 		if openid == "" {
 			checkIsSubscribeFlag = false
 		}
@@ -208,7 +211,7 @@ func (this *Distrib) LinkShareE(discored string) error {
 		checkIsSubscribeFlag = CheckUserIsSubscribe(openid)
 	}
 
-	userId, _ := this.Session().Get("userId").(string)
+	userId, _ := getsession["userId"].(string)
 	go this.ShareLogs(discored, userId)
 	if !checkIsSubscribeFlag {
 		if discored == "" {
@@ -221,7 +224,7 @@ func (this *Distrib) LinkShareE(discored string) error {
 	return this.Redirect("/distribution/share/" + discored)
 }
 
-//type 1:超级订阅 2:数据导出 3:数据报告 4:线上课程5公告信息
+// type 1:超级订阅 2:数据导出 3:数据报告 4:线上课程5公告信息
 func (this *Distrib) ShareLogs(discored, userId string) {
 	typ := 0
 	if discored[:1] == "A" { //超级订阅

+ 3 - 2
src/jfw/front/entsearch.go

@@ -58,8 +58,9 @@ func (e *Entsearch) PushSearchIndex() error {
 	if len(shareid) == 0 {
 		shareid = "10"
 	}
+	getsession := e.Session().GetMultiple()
 	e.T["isLogin"] = 0
-	if userId, _ := e.GetSession("userId").(string); userId != "" {
+	if userId, _ := getsession["userId"].(string); userId != "" {
 		userInfo := jy.GetVipState(e.Session(), *config.Middleground, userId)
 		e.T["isVip"] = userInfo.VipState > 0
 		e.T["isMember"] = userInfo.BigMember > 0
@@ -68,7 +69,7 @@ func (e *Entsearch) PushSearchIndex() error {
 		e.T["isEntService"] = userInfo.EntService
 		e.T["isLogin"] = 1
 	}
-	e.T["login"] = e.Session().Get("user")
+	e.T["login"] = getsession["user"]
 	e.T["shareid"] = se.EncodeString(shareid)
 	e.T["searchvalue"] = e.GetString("searchvalue")
 	e.T["logid"] = config.Seoconfig["jyzbqyss"].(string)

+ 52 - 48
src/jfw/front/follow.go

@@ -68,17 +68,16 @@ func init() {
 	followLimit = util.IntAllDef(config.Sysconfig["followProject"], 10)
 }
 
-//项目关注数据合并一张表 路由到大会员项目关注列表
+// 项目关注数据合并一张表 路由到大会员项目关注列表
 func (m *Follow) NewList() error {
 	return m.Redirect("/big/wx/page/pro_follow_list")
 }
 
-//非大会员用户访问关注项目-->访问大会员的项目管理路由
+// 非大会员用户访问关注项目-->访问大会员的项目管理路由
 func (m *Follow) DetaiToList() error {
 	return m.Redirect("/big/wx/page/pro_follow_list")
 }
 
-//
 func (m *Follow) CheckFPStatus() error {
 	defer util.Catch()
 	s_id := DecodeArticleId2ByCheck(m.GetString("s_id"))[0]
@@ -93,7 +92,6 @@ func (m *Follow) CheckFPStatus() error {
 	return nil
 }
 
-//
 func (m *Follow) CheckCStatus() error {
 	defer util.Catch()
 	//pname := m.GetString("pcname")
@@ -113,7 +111,6 @@ func (m *Follow) CheckCStatus() error {
 	return nil
 }
 
-//
 func (m *Follow) Mylist() {
 	defer util.Catch()
 	id := m.GetString("id")
@@ -128,7 +125,7 @@ func (m *Follow) Mylist() {
 	})
 }
 
-//关注列表关注
+// 关注列表关注
 func (m *Follow) Fwsave() {
 	defer util.Catch()
 	userId := m.GetSession("userId").(string)
@@ -192,7 +189,7 @@ func (m *Follow) Fwsave() {
 	})
 }
 
-//关注列表关注
+// 关注列表关注
 func (m *Follow) FwsaveBk() {
 	defer util.Catch()
 	userId := m.GetSession("userId").(string)
@@ -281,16 +278,17 @@ func (m *Follow) FwsaveBk() {
 	})
 }
 
-//分享关注项目
+// 分享关注项目
 func (m *Follow) ShareFW(tp string) error {
 	defer util.Catch()
+	getsession := m.Session().GetMultiple()
 	tpm := strings.Split(tp, "__")
 	id := DecodeArticleId2ByCheck(tpm[0])[0]
 	projectname := tpm[1]
 	openid := tpm[2]
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	userId := m.GetSession("userId")
@@ -347,7 +345,6 @@ func (m *Follow) ShareFW(tp string) error {
 	return m.Render("/weixin/follow/shareset.html", &m.T)
 }
 
-//
 func (m *Follow) PcAllNotice() error {
 	defer util.Catch()
 	id := DecodeArticleId2ByCheck(m.GetString("id"))[0]
@@ -377,7 +374,7 @@ func (m *Follow) PcAllNotice() error {
 	return nil
 }
 
-//中标企业公告列表
+// 中标企业公告列表
 func (m *Follow) PcEntAllNotice() error {
 	defer util.Catch()
 	entname := m.GetString("entname")
@@ -403,15 +400,16 @@ func (m *Follow) PcEntAllNotice() error {
 	return nil
 }
 
-//未关注项目
+// 未关注项目
 func (m *Follow) Photo(tp string) error {
 	defer util.Catch()
 	followid := ""
 	tpm := strings.Split(tp, "__")
 	projectname := tpm[1]
 	projectcode := tpm[2]
-	userid, _ := m.GetSession("userId").(string)
-	openid := m.GetSession("s_m_openid").(string)
+	getsession := m.Session().GetMultiple()
+	userid, _ := getsession["userId"].(string)
+	openid := getsession["s_m_openid"].(string)
 	if userid != "" && openid != "" {
 		_, followid = MFollow(userid, openid)
 	}
@@ -530,17 +528,17 @@ func (m *Follow) Photo(tp string) error {
 		m.T["mySelf"] = mySelf
 		m.T["source"] = 1
 	}
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	m.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
 	return m.Render("/weixin/follow/set.html", &m.T)
 }
 
-//关注项目相关的ajax请求
+// 关注项目相关的ajax请求
 func (m *Follow) AjaxReq() {
 	defer util.Catch()
 	userId := m.GetSession("userId").(string)
@@ -656,7 +654,7 @@ func (m *Follow) AjaxReq() {
 	})
 }
 
-//关注项目相关的ajax请求
+// 关注项目相关的ajax请求
 func (m *Follow) AjaxReqBk() {
 	defer util.Catch()
 	userId := m.GetSession("userId").(string)
@@ -783,7 +781,8 @@ func (m *Follow) AjaxReqBk() {
 }
 
 func (m *Follow) List() error {
-	userId := util.ObjToString(m.Session().Get("userId"))
+	getsession := m.Session().GetMultiple()
+	userId := util.ObjToString(getsession["userId"])
 	if userId == "" {
 		return errors.New("查询我关注的项目出错,userid为空")
 	}
@@ -878,10 +877,10 @@ func (m *Follow) List() error {
 	if len(*datas) >= followLimit {
 		m.T["flag"] = true
 	}
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	m.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
@@ -889,11 +888,12 @@ func (m *Follow) List() error {
 	return m.Render("/weixin/follow/list.html", &m.T)
 }
 
-//我关注的项目
+// 我关注的项目
 func (m *Follow) ListBk() error {
 	defer util.Catch()
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
-	userId := util.ObjToString(m.Session().Get("userId"))
+	getsession := m.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
+	userId := util.ObjToString(getsession["userId"])
 	if userId == "" {
 		return errors.New("查询我关注的项目出错,userid为空")
 	}
@@ -912,8 +912,8 @@ func (m *Follow) ListBk() error {
 		}
 	}
 	m.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
@@ -921,19 +921,20 @@ func (m *Follow) ListBk() error {
 	return m.Render("/weixin/follow/list.html", &m.T)
 }
 
-//添加关注项目
+// 添加关注项目
 func (m *Follow) Add() error {
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	getsession := m.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
 	m.T["openid"] = se.EncodeString(myopenid)
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	return m.Render("/weixin/follow/add.html", &m.T)
 }
 
-//手动添加关注项目
+// 手动添加关注项目
 func (m *Follow) Addsave() error {
 	defer util.Catch()
 	var status = "n"
@@ -993,7 +994,7 @@ func (m *Follow) Addsave() error {
 	return nil
 }
 
-//手动添加关注项目
+// 手动添加关注项目
 func (m *Follow) AddsaveBk() error {
 	defer util.Catch()
 	var status = "n"
@@ -1307,10 +1308,11 @@ func (m *Follow) SetBk(tp, id string) error {
 	}
 	m.T["projectname"] = projectname
 	m.T["projectcode"] = projectcode
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	getsession := m.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
 	m.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
@@ -1467,8 +1469,9 @@ func (m *Follow) Notice(id, followId string) error {
 	}
 	m.T["id"] = EncodeArticleId2ByCheck(id)
 	m.T["openid"] = se.EncodeString(util.ObjToString(m.GetSession("s_m_openid")))
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	getsession := m.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
@@ -1513,7 +1516,7 @@ func convertWeekday(weekday string) string {
 	return "周" + weekday
 }
 
-//删除redis相关数据
+// 删除redis相关数据
 func delRelRedis(userid interface{}, relationinfo interface{}) {
 	defer util.Catch()
 	uid, _ := userid.(string)
@@ -1527,13 +1530,14 @@ func delRelRedis(userid interface{}, relationinfo interface{}) {
 	}
 }
 
-//拉新获取超级订阅
+// 拉新获取超级订阅
 func (this *Follow) FollowGift(shareid string) error {
 	defer util.Catch()
 	client := this.Header("User-Agent")
 	bm := mobileReg.MatchString(client)
-	openid, _ := this.Session().Get("s_m_openid").(string)
-	nickname, _ := this.Session().Get("s_nickname").(string)
+	getsession := this.Session().GetMultiple()
+	openid, _ := getsession["s_m_openid"].(string)
+	nickname, _ := getsession["s_nickname"].(string)
 	redisName := util.ObjToString(config.Sysconfig["shareRedisName"])
 	headImg := ""
 	qrstr := ""
@@ -1570,7 +1574,7 @@ func (this *Follow) FollowGift(shareid string) error {
 	}
 	if bm {
 		if openid == "" {
-			if this.Session().Get("s_m_openid") == nil {
+			if getsession["s_m_openid"] == nil {
 				if this.GetString("state") == "wx" {
 					//微信跳回来的
 					code := this.GetString("code")
@@ -1597,8 +1601,8 @@ func (this *Follow) FollowGift(shareid string) error {
 		this.T["share_headImg"] = headImg
 		this.T["openid"] = se.EncodeString(openid)
 		this.T["share_qr"] = qrstr
-		mynickname, _ := this.Session().Get("s_nickname").(string)
-		myavatar, _ := this.Session().Get("s_avatar").(string)
+		mynickname, _ := getsession["s_nickname"].(string)
+		myavatar, _ := getsession["s_avatar"].(string)
 		this.T["nickname"] = mynickname
 		this.T["avatar"] = myavatar
 		return this.Render("/frontRouter/wx/share/sess/b-share.html", &this.T)
@@ -1613,7 +1617,7 @@ func (this *Follow) FollowGift(shareid string) error {
 	}
 }
 
-//根据多个信息id查询对应的项目信息
+// 根据多个信息id查询对应的项目信息
 func getProjectsBySid(sids []string) ([]map[string]interface{}, error) {
 	sidStr := strings.Join(sids, `","`)
 	list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"terms": {"list.infoid": ["`+sidStr+`"]}}]}},"_source":["projectname","topscopeclass","_id","area","buyerclass","budget","ids","bidstatus","projectcode"],"from": 0,"size": `+fmt.Sprint(len(sids))+`}`)

+ 3 - 2
src/jfw/front/laboratory.go

@@ -25,9 +25,10 @@ func (l *Lab) TreasureBox() error {
 	if userid == "" {
 		return l.Redirect("/swordfish/about")
 	}
+	getsession := l.Session().GetMultiple()
 	l.T["signature"] = wx.SignJSSDK(l.Site() + l.Url())
-	l.T["nickname"] = l.Session().Get("s_nickname").(string)
-	l.T["avatar"] = l.Session().Get("s_avatar").(string)
+	l.T["nickname"] = getsession["s_nickname"].(string)
+	l.T["avatar"] = getsession["s_avatar"].(string)
 	l.T["s_m_openid"] = se.EncodeString(openid)
 	return l.Render("/weixin/treasure_box.html", &l.T)
 }

+ 6 - 7
src/jfw/front/org_structure.go

@@ -35,7 +35,6 @@ type OrgStructure struct {
 	autoLogon      xweb.Mapper `xweb:"/orgstructure/autoLogon"`      //非剑鱼用户接收邀请注册为剑鱼用户
 }
 
-//
 func (this *OrgStructure) InvitationQR(depId string) {
 	wxWebdomain := util.ObjToString(config.Sysconfig["wxWebdomain"])
 	entId := this.GetString("entId")         //加密后-企业id
@@ -59,8 +58,8 @@ func (this *OrgStructure) InvitationQR(depId string) {
 	}
 }
 
-//
 func (this *OrgStructure) InvitationPage() error {
+	getsession := this.Session().GetMultiple()
 	client := this.Header("User-Agent")
 	entUserId := this.GetString("entUserId") //加密后-企业邀请人id
 	depId := this.GetString("depId")         //加密后-部门id
@@ -74,9 +73,9 @@ func (this *OrgStructure) InvitationPage() error {
 	if !mobileReg.MatchString(client) {
 		OrgUrl = util.ObjToString(config.Sysconfig["pcOrgUrl"]) + "?entUserId=" + entUserId + "&depId=" + depId + "&entId=" + entId + "&depcname=" + depcname + "&source=" + source
 	} else if entUserId_sess == nil || util.ObjToString(entUserId_sess) != entUserId_str {
-		userId := util.ObjToString(this.Session().Get("userId"))
-		openId := util.ObjToString(this.Session().Get("s_m_openid"))
-		phone := util.ObjToString(this.Session().Get("phone"))
+		userId := util.ObjToString(getsession["userId"])
+		openId := util.ObjToString(getsession["s_m_openid"])
+		phone := util.ObjToString(getsession["phone"])
 		isSubscribe := false //是否关注
 		if userId == "" {
 			if this.GetString("state") == "wx" {
@@ -107,7 +106,7 @@ func (this *OrgStructure) InvitationPage() error {
 
 }
 
-//暂时不用
+// 暂时不用
 func (this *OrgStructure) Authorize() error {
 	openId := util.ObjToString(this.Session().Get("s_m_openid"))
 	unionId := ""
@@ -136,7 +135,7 @@ func (this *OrgStructure) Authorize() error {
 	return nil
 }
 
-//移动端(PC端已注册)
+// 移动端(PC端已注册)
 func (this *OrgStructure) AutoLogon() error {
 	openId := this.GetString("openId")
 	phone := this.GetString("phone")

+ 3 - 2
src/jfw/front/otherAct.go

@@ -53,8 +53,9 @@ func (f *Front) SendMessage() {
 	session := f.Session()
 	phoneNum := f.GetString("phoneNum")
 	imgCancode := f.GetString("imgCancode")
-	ccid, _ := f.GetSession("CheckCodeId").(string)
-	lastSendMsgTime := util.Int64All(session.Get("lastSendMsgTime"))
+	getsession := f.Session().GetMultiple()
+	ccid, _ := getsession["CheckCodeId"].(string)
+	lastSendMsgTime := util.Int64All(getsession["lastSendMsgTime"])
 	//通过图片验证
 	if captcha.VerifyString(ccid, imgCancode) {
 		//当前时间-上次发送时间>60s

+ 14 - 14
src/jfw/front/search.go

@@ -32,21 +32,22 @@ func init() {
 	xweb.AddAction(&Search{})
 }
 
-//剑鱼标讯微信端jssdk接口信息
+// 剑鱼标讯微信端jssdk接口信息
 func (s *Search) WxInfo() error {
 	defer util.Catch()
 	var url = s.GetString("url")
 	var openid = ""
-	if s.Session().Get("s_m_openid") != nil {
-		openid = s.Session().Get("s_m_openid").(string)
+	getsession := s.Session().GetMultiple()
+	if getsession["s_m_openid"] != nil {
+		openid, _ = getsession["s_m_openid"].(string)
 	}
 	var nickname = ""
-	if s.Session().Get("s_nickname") != nil {
-		nickname = s.Session().Get("s_nickname").(string)
+	if getsession["s_nickname"] != nil {
+		nickname, _ = getsession["s_nickname"].(string)
 	}
 	var avatar = ""
-	if s.Session().Get("s_avatar") != nil {
-		avatar = s.Session().Get("s_avatar").(string)
+	if getsession["s_avatar"] != nil {
+		avatar, _ = getsession["s_avatar"].(string)
 	}
 	var res = map[string]interface{}{
 		"signature": wx.SignJSSDK(url),
@@ -61,7 +62,7 @@ func (s *Search) WxInfo() error {
 	return nil
 }
 
-///jylab/mainSearchStat?m=-125
+// /jylab/mainSearchStat?m=-125
 func (this *Search) MainSearchStat() error {
 	userid := util.ObjToString(this.GetSession("userId"))
 	if userid != "" { //已有session,直接跳转至结果页面
@@ -79,7 +80,6 @@ func (this *Search) MainSearchStat() error {
 	return this.Redirect("/swordfish/about?source=open_infocontent&o=" + oCode)
 }
 
-//
 func (s *Search) MainSearch() error {
 	userid := s.GetSession("userId")
 
@@ -97,10 +97,10 @@ func (s *Search) MainSearch() error {
 	// 	s.T["pageSize"] = bidsearch.SearchPageSize_WX
 	// 	//搜索列表增加分享
 	// 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
-	// 	myopenid, _ := s.Session().Get("s_m_openid").(string)
+	// 	myopenid, _ := s.getsession["s_m_openid").(string)
 	// 	s.T["openid"] = se.EncodeString(myopenid)
-	// 	mynickname, _ := s.Session().Get("s_nickname").(string)
-	// 	myavatar, _ := s.Session().Get("s_avatar").(string)
+	// 	mynickname, _ := s.getsession["s_nickname").(string)
+	// 	myavatar, _ := s.getsession["s_avatar").(string)
 	// 	s.T["nickname"] = mynickname
 	// 	s.T["avatar"] = myavatar
 	// 	s.T["searchWord"] = s.GetString("searchWord")
@@ -117,7 +117,7 @@ func (s *Search) SearchKeyword(searchWord string) error {
 	return s.Redirect("/jylab/mainSearch?searchWord=" + searchWord)
 }
 
-//获取历史记录和关键词
+// 获取历史记录和关键词
 func (s *Search) GetHK() error {
 	defer util.Catch()
 	userid := s.GetSession("userId")
@@ -130,7 +130,7 @@ func (s *Search) GetHK() error {
 			history = strings.Split(h, ",")
 		}
 		//我的订阅
-		one:=jyutil.Compatible.Select( userid.(string), `{"o_jy":1}`)
+		one := jyutil.Compatible.Select(userid.(string), `{"o_jy":1}`)
 		if one != nil && len(*one) > 0 {
 			o_jy, _ := (*one)["o_jy"].(map[string]interface{})
 			a_key, _ := o_jy["a_key"].([]interface{})

+ 4 - 3
src/jfw/front/shorturl.go

@@ -139,6 +139,7 @@ func (s *Short) LoginCommon(userId, stype, id string, bm bool) error {
 			return s.Redirect(fmt.Sprintf("%s%s%s", config.Sysconfig["workDesktopUrl"].(string), config.Sysconfig["webdomain"].(string), url.QueryEscape(strings.Replace(s.Request.URL.String(), replaceStr, paramSuffix, 1))))
 		}
 	}
+	getsession := s.Session().GetMultiple()
 	//先判断是否有session
 	source := s.GetString("source")
 	disWord := s.GetString("disWord")
@@ -219,7 +220,7 @@ func (s *Short) LoginCommon(userId, stype, id string, bm bool) error {
 			s.T["logid"] = config.Seoconfig["jysskzy"].(string)
 			s.T["shareid"] = se.EncodeString(shareid)
 			s.T["keywords"] = s.GetString("kds")
-			ssOpenid := s.Session().Get("s_m_openid")
+			ssOpenid := getsession["s_m_openid"]
 			po, bo, wo, obj := pcVRT(sid, industry, stype, true)
 			if obj != nil && len(obj) > 0 {
 
@@ -280,7 +281,7 @@ func (s *Short) LoginCommon(userId, stype, id string, bm bool) error {
 			return s.SetBody([]byte(res.(string)))
 		}
 	}
-	ssOpenid := s.Session().Get("s_m_openid")
+	ssOpenid := getsession["s_m_openid"]
 	var (
 		res *map[string]interface{}
 		ok  bool
@@ -370,7 +371,7 @@ func (s *Short) LoginCommon(userId, stype, id string, bm bool) error {
 		if shareopenid != "" {
 			s.T["shareopenid"] = shareopenid
 		}
-		myopenid, _ := s.Session().Get("s_m_openid").(string)
+		myopenid, _ := getsession["s_m_openid"].(string)
 		if myopenid == "" {
 			myopenid = shareopenid
 			s.T["openid"] = myopenid //"-1"

+ 52 - 43
src/jfw/front/swordfish.go

@@ -642,15 +642,16 @@ func (m *Front) VisitRedirect() {
 	if shareopenid != "" {
 		m.T["shareopenid"] = shareopenid
 	}
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	getsession := m.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
 	if myopenid == "" {
 		myopenid = shareopenid
 		m.T["openid"] = myopenid //"-1"
 	} else {
 		m.T["openid"] = se.EncodeString(myopenid) //"-1"
 	}
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
@@ -1155,6 +1156,7 @@ const (
 // 预览结果
 func (m *Front) WxpushView() error {
 	defer util.Catch()
+	getsession := m.Session().GetMultiple()
 	userid := util.ObjToString(m.GetSession("userId"))
 	openid := util.ObjToString(m.GetSession("s_m_openid"))
 	pageSize, _ := m.GetInteger("pageSize")
@@ -1167,8 +1169,8 @@ func (m *Front) WxpushView() error {
 	m.T["hasNextPage"] = list != nil && len(*list) == pageSize
 	m.T["pageSize"] = pageSize
 	m.T["a_key"] = a_key
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
@@ -1178,9 +1180,10 @@ func (m *Front) WxpushView() error {
 func (m *Front) WxpushViewPaging() {
 	defer util.Catch()
 	var list *[]map[string]interface{}
+	getsession := m.Session().GetMultiple()
 	pageNum, _ := m.GetInteger("pageNum")
 	pageSize, _ := m.GetInteger("pageSize")
-	if userid := m.Session().Get("userId"); userid != nil {
+	if userid := getsession["userId"]; userid != nil {
 		_, list = public.PushViewDatas(userid.(string), "", bidSearch_field_1, pageNum, pageSize)
 	}
 	public.BidListConvert("", list)
@@ -1192,15 +1195,16 @@ func (m *Front) WxpushViewPaging() {
 
 func (m *Front) Guide(sign string) error {
 	defer util.Catch()
-	if m.Session().Get("userId") == nil || m.Session().Get("s_m_openid") == nil {
+	getsession := m.Session().GetMultiple()
+	if getsession["userId"] == nil || getsession["s_m_openid"] == nil {
 		return m.Redirect("/swordfish/share/-1")
 	}
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	m.T["openid"] = se.EncodeString(myopenid)
 	m.T["sign"] = sign
 	if sign == "other" {
@@ -1219,24 +1223,24 @@ func (m *Front) Guide(sign string) error {
 func (m *Front) Share(openids string) error {
 	return m.Redirect("/swordfish/about")
 	//
-	defer util.Catch()
-	var openid = ""
-	var jy_code = ""
-	if openids != "-1" {
-		wxid_code := strings.Split(openids, "__")
-		if len(wxid_code) > 0 {
-			openid = wxid_code[0]
-			jy_code = wxid_code[1]
-		}
-	}
-	m.T["openid"] = openid
-	m.T["jy_code"] = jy_code
-	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
-	m.T["nickname"] = mynickname
-	m.T["avatar"] = myavatar
-	return m.Render("/weixin/wxshare.html", &m.T)
+	//defer util.Catch()
+	//var openid = ""
+	//var jy_code = ""
+	//if openids != "-1" {
+	//    wxid_code := strings.Split(openids, "__")
+	//    if len(wxid_code) > 0 {
+	//        openid = wxid_code[0]
+	//        jy_code = wxid_code[1]
+	//    }
+	//}
+	//m.T["openid"] = openid
+	//m.T["jy_code"] = jy_code
+	//m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
+	//mynickname, _ := m.getsession["s_nickname").(string)
+	//myavatar, _ := m.getsession["s_avatar").(string)
+	//m.T["nickname"] = mynickname
+	//m.T["avatar"] = myavatar
+	//return m.Render("/weixin/wxshare.html", &m.T)
 }
 
 /*func (m *Front) WxpushAjaxReq() error {
@@ -1262,9 +1266,10 @@ func (m *Front) About() error {
 	if from := m.GetString("from"); from != "" {
 		from_userid = se.Decode4Hex(from)
 	}
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	getsession := m.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	isSubscribe := false
 	if myopenid == "" {
 		if m.GetString("state") == "wx" {
@@ -1284,8 +1289,8 @@ func (m *Front) About() error {
 		isSubscribe = CheckUserIsSubscribe(myopenid)
 		if isSubscribe {
 			FindUserAndCreateSess(myopenid, m.Session(), "wx", false, true)
-			myopenid, _ = m.Session().Get("s_m_openid").(string)
-			mynickname, _ = m.Session().Get("s_nickname").(string)
+			myopenid, _ = getsession["s_m_openid"].(string)
+			mynickname, _ = getsession["s_nickname"].(string)
 		}
 	}
 	param := m.GetString("param")
@@ -1382,9 +1387,10 @@ func (m *Front) Shareabout(openids string) error {
 			openid = wxid_code[0]
 		}
 	}
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	getsession := m.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	if openid == "" && myopenid != "" {
 		m.T["openid"] = se.EncodeString(myopenid)
 	} else {
@@ -1403,10 +1409,11 @@ func (m *Front) Shareabout(openids string) error {
 }
 
 func (m *Front) Aboutsearch() error {
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	getsession := m.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
 	m.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
@@ -1520,11 +1527,12 @@ func (f *Front) MyFeedbacks() error {
 	if !ok {
 		return nil
 	}
+	getsession := f.Session().GetMultiple()
 	if f.Method() == "GET" {
 		f.T["list"] = list
 		f.T["flag"] = true
-		mynickname, _ := f.Session().Get("s_nickname").(string)
-		myavatar, _ := f.Session().Get("s_avatar").(string)
+		mynickname, _ := getsession["s_nickname"].(string)
+		myavatar, _ := getsession["s_avatar"].(string)
 		myopenid, _ := f.GetSession("s_m_openid").(string)
 		f.T["nickname"] = mynickname
 		f.T["avatar"] = myavatar
@@ -1864,8 +1872,9 @@ func (f *Front) Newhistorypush() error {
 		}
 	}
 	f.T["forceShareFlag"] = public.CheckUserNeedForceShare(myopenid, public.ShareType_push, config.Sysconfig)
-	mynickname, _ := f.Session().Get("s_nickname").(string)
-	myavatar, _ := f.Session().Get("s_avatar").(string)
+	getsession := f.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	f.T["nickname"] = mynickname
 	f.T["avatar"] = myavatar
 	f.T["signature"] = wx.SignJSSDK(f.Site() + f.Url())

+ 42 - 31
src/jfw/front/vipsubscribe.go

@@ -89,9 +89,10 @@ var (
 
 // 推送设置
 func (s *Subscribepay) ToVIPViewPage() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -101,9 +102,10 @@ func (s *Subscribepay) ToVIPViewPage() {
 
 // 附加词|排除词
 func (s *Subscribepay) ToSetOtherKwsPage(page string) {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -113,9 +115,10 @@ func (s *Subscribepay) ToSetOtherKwsPage(page string) {
 
 // 推送设置
 func (s *Subscribepay) ToSetPushSetPage() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -125,9 +128,11 @@ func (s *Subscribepay) ToSetPushSetPage() {
 
 // 信息类型
 func (s *Subscribepay) ToSetInfoTypePage() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -137,7 +142,8 @@ func (s *Subscribepay) ToSetInfoTypePage() {
 
 // 订阅设置
 func (s *Subscribepay) ToSetPage() error {
-	userid := util.ObjToString(s.GetSession("userId"))
+	getsession := s.Session().GetMultiple()
+	userid := util.ObjToString(getsession["userId"])
 	vSwitch := s.GetString("vSwitch")
 	if vSwitch != "" {
 		if vSwitch == jy.SwitchService.Vip {
@@ -163,9 +169,9 @@ func (s *Subscribepay) ToSetPage() error {
 	s.T["liveActiveStartTime"] = liveActiveStartTime
 	s.T["liveActiveEndTime"] = liveActiveEndTime
 	s.T["activeDiscount"] = activeDiscount
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -174,9 +180,10 @@ func (s *Subscribepay) ToSetPage() error {
 }
 
 func (s *Subscribepay) ToSetPageOld() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -338,9 +345,10 @@ func (s *Subscribepay) ToOrderDetailPage() {
 
 // 订阅收费设置关键词
 func (s *Subscribepay) ToSetKeyWordPage() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -370,9 +378,10 @@ func (s *Subscribepay) SubmitEditSubFinish() {
 
 // 升级订阅新增区域
 func (s *Subscribepay) AddArea() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -382,9 +391,10 @@ func (s *Subscribepay) AddArea() {
 
 // 升级订阅新增行业
 func (s *Subscribepay) AddIndustry() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
@@ -394,9 +404,10 @@ func (s *Subscribepay) AddIndustry() {
 
 // 服务续费(will:即将到期,exprie:已到期)
 func (s *Subscribepay) RenewPage(sign string) {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
+	getsession := s.Session().GetMultiple()
+	myopenid := util.ObjToString(getsession["s_m_openid"])
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	startTime := util.Int64All(s.GetString("startTime"))
 	endTime := util.Int64All(s.GetString("endTime"))
 	orderId := s.GetString("orderId")

+ 8 - 6
src/jfw/front/ws_dataExport.go

@@ -45,6 +45,7 @@ func init() {
 }
 
 func (w *WsDataExport) WxToOrderDetail() error {
+	getsession := w.Session().GetMultiple()
 	myOpenid := ""
 	if openid := w.GetSession("s_m_openid"); openid != nil {
 		myOpenid = openid.(string)
@@ -65,18 +66,18 @@ func (w *WsDataExport) WxToOrderDetail() error {
 			}
 		}
 		userid := util.ObjToString(w.GetSession("userId"))
-		myOpenid, _ = w.Session().Get("s_m_openid").(string)
+		myOpenid, _ = getsession["s_m_openid"].(string)
 		if userid == "" {
 			return errors.New("未登录")
 		}
 	}
-	myUserId, _ := w.Session().Get("userId").(string)
+	myUserId, _ := getsession["userId"].(string)
 	orderCode := w.GetString("orderCode")
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
 	w.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	//-----------------------
@@ -222,8 +223,9 @@ func (w *WsDataExport) GetPreview() error {
 // 预览
 func (w *WsDataExport) ToPreview(_id string) error {
 	defer util.Catch()
-	openid, _ := w.Session().Get("s_m_openid").(string)
-	userid, _ := w.Session().Get("userId").(string)
+	getsession := w.Session().GetMultiple()
+	openid, _ := getsession["s_m_openid"].(string)
+	userid, _ := getsession["userId"].(string)
 	if userid == "" {
 		if w.GetString("state") == "wx" {
 			//微信跳回来的

+ 43 - 33
src/jfw/front/wxMyOrder.go

@@ -53,7 +53,7 @@ var (
 func (w *WxMyOrder) MyMenu() error {
 	// 页面vue重构
 	return w.Redirect("/jy_mobile/tabbar/me")
-	//if w.Session().Get("userId") == nil {
+	//if getsession["userId") == nil {
 	//
 	//	if w.GetString("state") == "wx" {
 	//		//微信跳回来的
@@ -77,30 +77,31 @@ func (w *WxMyOrder) MyMenu() error {
 	//}
 	////分享
 	//w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	//w.T["nickname"], _ = w.Session().Get("s_nickname").(string)
-	//myopenid, _ := w.Session().Get("s_m_openid").(string)
+	//w.T["nickname"], _ = getsession["s_nickname").(string)
+	//myopenid, _ := getsession["s_m_openid").(string)
 	//w.T["openid"] = se.EncodeString(myopenid)
-	//w.T["avatar"], _ = w.Session().Get("s_avatar").(string)
+	//w.T["avatar"], _ = getsession["s_avatar").(string)
 	//return w.Render("weixin/my.html", &w.T)
 }
 
 func (w *WxMyOrder) MyEmail() {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	getsession := w.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
-	w.T["userId"] = util.ObjToString(w.GetSession("userId"))
+	w.T["userId"] = util.ObjToString(getsession["userId"])
 
-	name := w.GetString("name") //
+	name := getsession["name"] //
 	//检测用户是否绑定邮箱
-	if util.ObjToString(w.GetSession("userId")) != "" {
-		w.T["userId"] = util.ObjToString(w.GetSession("userId"))
+	if util.ObjToString(getsession["userId"]) != "" {
+		w.T["userId"] = util.ObjToString(getsession["userId"])
 	}
-	res := jyutil.Compatible.Select(util.ObjToString(w.GetSession("userId")), `"s_myemail":1`)
+	res := jyutil.Compatible.Select(util.ObjToString(getsession["userId"]), `"s_myemail":1`)
 	if len(*res) > 0 {
 		if util.ObjToString((*res)["s_myemail"]) == "" || name != "" {
 			//未绑定邮箱 进入绑定邮箱界面
@@ -128,20 +129,22 @@ func (w *WxMyOrder) MyEmail() {
 func (w *WxMyOrder) SetSuccess() {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	getsession := w.Session().GetMultiple()
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
-	w.T["userId"] = util.ObjToString(w.GetSession("userId"))
+	w.T["userId"] = util.ObjToString(getsession["userId"])
 
 	w.Render("/weixin/email/bind_success.html", &w.T)
 }
 
 func (w *WxMyOrder) WxGetOrderCode(order_code string) error {
 	myOpenid := ""
-	if openid := w.GetSession("s_m_openid"); openid != nil {
+	getsession := w.Session().GetMultiple()
+	if openid := getsession["s_m_openid"]; openid != nil {
 		myOpenid = openid.(string)
 	} else {
 		return errors.New("未登录")
@@ -149,8 +152,8 @@ func (w *WxMyOrder) WxGetOrderCode(order_code string) error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
 	w.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	//-----------------------
@@ -172,8 +175,9 @@ func (w *WxMyOrder) WxGetOrderCode(order_code string) error {
 }
 
 func (w *WxMyOrder) WxPaySuccess(order_code string) error {
-	userId := w.Session().Get("userId")
-	openid := w.Session().Get("s_m_openid")
+	getsession := w.Session().GetMultiple()
+	userId := getsession["userId"]
+	openid := getsession["s_m_openid"]
 	if userId == nil || openid == nil {
 		return errors.New("未登录")
 	}
@@ -261,8 +265,9 @@ func (t *WxMyOrder) MemberDetail(order_code string) {
 	myOpenid, _ := t.GetSession("s_m_openid").(string)
 	t.T["signature"] = wx.SignJSSDK(t.Site() + t.Url())
 	t.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := t.Session().Get("s_nickname").(string)
-	myavatar, _ := t.Session().Get("s_avatar").(string)
+	getsession := t.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	t.T["nickname"] = mynickname
 	t.T["avatar"] = myavatar
 	t.T["order_code"] = order_code
@@ -274,8 +279,9 @@ func (t *WxMyOrder) AiForecastPackdetail(order_code string) {
 	myOpenid, _ := t.GetSession("s_m_openid").(string)
 	t.T["signature"] = wx.SignJSSDK(t.Site() + t.Url())
 	t.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := t.Session().Get("s_nickname").(string)
-	myavatar, _ := t.Session().Get("s_avatar").(string)
+	getsession := t.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	t.T["nickname"] = mynickname
 	t.T["avatar"] = myavatar
 	t.T["order_code"] = order_code
@@ -287,8 +293,9 @@ func (t *WxMyOrder) SubAccountDetail(order_code string) {
 	myOpenid, _ := t.GetSession("s_m_openid").(string)
 	t.T["signature"] = wx.SignJSSDK(t.Site() + t.Url())
 	t.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := t.Session().Get("s_nickname").(string)
-	myavatar, _ := t.Session().Get("s_avatar").(string)
+	getsession := t.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	t.T["nickname"] = mynickname
 	t.T["avatar"] = myavatar
 	t.T["order_code"] = order_code
@@ -299,8 +306,9 @@ func (t *WxMyOrder) BidfileDetail(order_code string) {
 	myOpenid, _ := t.GetSession("s_m_openid").(string)
 	t.T["signature"] = wx.SignJSSDK(t.Site() + t.Url())
 	t.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := t.Session().Get("s_nickname").(string)
-	myavatar, _ := t.Session().Get("s_avatar").(string)
+	getsession := t.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	t.T["nickname"] = mynickname
 	t.T["avatar"] = myavatar
 	t.T["order_code"] = order_code
@@ -311,8 +319,9 @@ func (t *WxMyOrder) IntegralDetail(order_code string) {
 	myOpenid, _ := t.GetSession("s_m_openid").(string)
 	t.T["signature"] = wx.SignJSSDK(t.Site() + t.Url())
 	t.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := t.Session().Get("s_nickname").(string)
-	myavatar, _ := t.Session().Get("s_avatar").(string)
+	getsession := t.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	t.T["nickname"] = mynickname
 	t.T["avatar"] = myavatar
 	t.T["order_code"] = order_code
@@ -331,8 +340,9 @@ func (t *WxMyOrder) PcfilePackDetail() {
 	myOpenid, _ := t.GetSession("s_m_openid").(string)
 	t.T["signature"] = wx.SignJSSDK(t.Site() + t.Url())
 	t.T["openid"] = se.EncodeString(myOpenid)
-	mynickname, _ := t.Session().Get("s_nickname").(string)
-	myavatar, _ := t.Session().Get("s_avatar").(string)
+	getsession := t.Session().GetMultiple()
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	t.T["nickname"] = mynickname
 	t.T["avatar"] = myavatar
 	t.T["order_code"] = t.GetString("order_code")

+ 65 - 49
src/jfw/front/wx_dataExport.go

@@ -48,7 +48,8 @@ func init() {
 func (w *WxDataExport) ToSieve() error {
 	defer util.Catch()
 	orderCode := w.GetString("orderCode")
-	myUserId, _ := w.Session().Get("userId").(string)
+	getsession := w.Session().GetMultiple()
+	myUserId, _ := getsession["userId"].(string)
 	if orderCode != "" && myUserId != "" {
 		//-----------------------
 		orderDetail := map[string]interface{}{}
@@ -85,10 +86,10 @@ func (w *WxDataExport) ToSieve() error {
 	}
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport.html", &w.T)
@@ -233,11 +234,12 @@ func (w *WxDataExport) SaveData() error {
 // 区域
 func (w *WxDataExport) Area() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_area.html", &w.T)
@@ -247,11 +249,12 @@ func (w *WxDataExport) Area() error {
 // 行业
 func (w *WxDataExport) Industry() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_industry.html", &w.T)
@@ -261,11 +264,12 @@ func (w *WxDataExport) Industry() error {
 // 采购单位行业
 func (w *WxDataExport) Buyerclass() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_setCate.html", &w.T)
@@ -275,11 +279,12 @@ func (w *WxDataExport) Buyerclass() error {
 // 关键词
 func (w *WxDataExport) KeyWord() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_keyWord.html", &w.T)
@@ -289,11 +294,12 @@ func (w *WxDataExport) KeyWord() error {
 // 关键词输入
 func (w *WxDataExport) KeyWordInput() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_keyWordInput.html", &w.T)
@@ -303,11 +309,12 @@ func (w *WxDataExport) KeyWordInput() error {
 // 附加词
 func (w *WxDataExport) Appended() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_appended.html", &w.T)
@@ -317,11 +324,12 @@ func (w *WxDataExport) Appended() error {
 // 附加词输入
 func (w *WxDataExport) AppendedInput() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_appendedInput.html", &w.T)
@@ -331,11 +339,12 @@ func (w *WxDataExport) AppendedInput() error {
 // 排除词
 func (w *WxDataExport) Exclude() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_exclude.html", &w.T)
@@ -345,11 +354,12 @@ func (w *WxDataExport) Exclude() error {
 // 排除词输入
 func (w *WxDataExport) ExcludeInput() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_excludeInput.html", &w.T)
@@ -359,11 +369,12 @@ func (w *WxDataExport) ExcludeInput() error {
 // 金额
 func (w *WxDataExport) Price() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_price.html")
@@ -373,11 +384,12 @@ func (w *WxDataExport) Price() error {
 // 信息类型
 func (w *WxDataExport) SubType() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_subType.html")
@@ -387,11 +399,12 @@ func (w *WxDataExport) SubType() error {
 // 采购单位编辑
 func (w *WxDataExport) BuyerEdit() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_buyerEdit.html", &w.T)
@@ -401,11 +414,12 @@ func (w *WxDataExport) BuyerEdit() error {
 // 采购单位输入
 func (w *WxDataExport) BuyerInput() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_buyerInput.html", &w.T)
@@ -415,11 +429,12 @@ func (w *WxDataExport) BuyerInput() error {
 // 中标单位编辑
 func (w *WxDataExport) WinnerEdit() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_winnerEdit.html", &w.T)
@@ -429,11 +444,12 @@ func (w *WxDataExport) WinnerEdit() error {
 // 中标单位输入
 func (w *WxDataExport) WinnerInput() error {
 	//分享
+	getsession := w.Session().GetMultiple()
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
-	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	myopenid, _ := getsession["s_m_openid"].(string)
 	w.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	w.T["nickname"] = mynickname
 	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_winnerInput.html", &w.T)

+ 24 - 19
src/jfw/front/wxkeyset.go

@@ -17,10 +17,11 @@ import (
 	"time"
 )
 
-//进入订阅词设置
+// 进入订阅词设置
 func (m *Front) WxKeyset(tpl string) error {
 	defer util.Catch()
-	userid := util.ObjToString(m.GetSession("userId"))
+	getsession := m.Session().GetMultiple()
+	userid := util.ObjToString(getsession["userId"])
 	surprise := m.GetSession("surprise")
 	if userid == "" {
 		return m.Redirect("/swordfish/share/-1")
@@ -63,8 +64,8 @@ func (m *Front) WxKeyset(tpl string) error {
 	m.T["surprise"] = surprise
 	m.T["openid"] = se.EncodeString(util.ObjToString(m.GetSession("s_m_openid")))
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	//直播活动和预热活动期间
@@ -74,7 +75,7 @@ func (m *Front) WxKeyset(tpl string) error {
 	return m.Render("/weixin/wxkeyset/"+tpl+".html", &m.T)
 }
 
-//ajax各种请求
+// ajax各种请求
 func (m *Front) WxKeysetAjaxReq() {
 	defer util.Catch()
 	userId, _ := m.GetSession("userId").(string)
@@ -86,7 +87,7 @@ func (m *Front) WxKeysetAjaxReq() {
 	}
 	types := "o_jy"
 	//增加锁,防止map读写
-	//	lock, _ := m.Session().Get("Lock").(*sync.Mutex)
+	//	lock, _ := m.getsession["Lock").(*sync.Mutex)
 	//	lock.Lock()
 	//	defer lock.Unlock()
 	reqType := m.GetString("reqType")
@@ -293,7 +294,7 @@ func (m *Front) WxKeysetAjaxReq() {
 	return
 }
 
-//过滤[""]数组
+// 过滤[""]数组
 func fliterEmptyArr(beforeArr []string) []string {
 	afterArr := []string{}
 	for _, v := range beforeArr {
@@ -305,41 +306,45 @@ func fliterEmptyArr(beforeArr []string) []string {
 	return afterArr
 }
 
-//高级设置
+// 高级设置
 func (m *Front) WxKeysetSeniorset() error {
 	defer util.Catch()
-	userid := util.ObjToString(m.GetSession("userId"))
-	myopenid := util.ObjToString(m.GetSession("s_m_openid"))
+	getsession := m.Session().GetMultiple()
+
+	userid := util.ObjToString(getsession["userId"])
+	myopenid := util.ObjToString(getsession["s_m_openid"])
 	if myopenid == "" || userid == "" {
 		return m.Redirect("/swordfish/share/-1")
 	}
 	m.T["openid"] = se.EncodeString(myopenid)
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	return m.Render("/weixin/wxkeyset/seniorset.html")
 }
 
-//高级设置
+// 高级设置
 func (m *Front) WxKeysetFilterset() error {
 	defer util.Catch()
-	userid := util.ObjToString(m.GetSession("userId"))
-	myopenid := util.ObjToString(m.GetSession("s_m_openid"))
+	getsession := m.Session().GetMultiple()
+	userid := util.ObjToString(getsession["userId"])
+	myopenid := util.ObjToString(getsession["s_m_openid"])
 	if myopenid == "" || userid == "" {
 		return m.Redirect("/swordfish/share/-1")
 	}
 	m.T["openid"] = se.EncodeString(myopenid)
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
+
+	mynickname, _ := getsession["s_nickname"].(string)
+	myavatar, _ := getsession["s_avatar"].(string)
 	m.T["nickname"] = mynickname
 	m.T["avatar"] = myavatar
 	return m.Render("/weixin/wxkeyset/filterset.html")
 }
 
-//保存入库之前,处理订阅的关键词
+// 保存入库之前,处理订阅的关键词
 func processKeyword(keyword string) []string {
 	keywordReg := regexp.MustCompile("([\\s\u3000\u2003\u00a0+,,])+")
 	spaceReg := regexp.MustCompile("\\s+")
@@ -352,7 +357,7 @@ func processKeyword(keyword string) []string {
 	return strings.Split(keyword, " ")
 }
 
-//超级订阅优化,免费订阅判断新老用户  1:新用户 0:老用户
+// 超级订阅优化,免费订阅判断新老用户  1:新用户 0:老用户
 func NewUserByVIP(mData *map[string]interface{}) int {
 	if len(*mData) == 0 || mData == nil {
 		return 1

+ 6 - 6
src/jfw/jyutil/jyutil.go

@@ -113,7 +113,7 @@ func FindMyShareId(activecode, openid string) string {
 	return shareid
 }
 
-//获取用户openid
+// 获取用户openid
 func Getopenid(code string) (openid string) {
 	defer util.Catch()
 	recturl := fmt.Sprintf(config.Wxoauthinfo, code)
@@ -130,7 +130,6 @@ func Getopenid(code string) (openid string) {
 	return
 }
 
-//
 func GetSessionVal(q map[string]interface{}) (*map[string]interface{}, map[string]interface{}) {
 	person, ok := public.MQFW.FindOneByField("user", q, `{"_id":1,"i_shareknow":1,"s_m_openid":1,"s_nickname":1,"s_headimage":1,"s_headimageurl":1,"s_phone":1,"s_m_phone":1,"l_registedate":1,"i_ispush":1,"i_unlimited":1,"s_jyname":1,"base_user_id":1}`)
 	sessionVal := make(map[string]interface{})
@@ -171,7 +170,7 @@ func GetSessionVal(q map[string]interface{}) (*map[string]interface{}, map[strin
 	return person, sessionVal
 }
 
-//value 用户sessionid
+// value 用户sessionid
 func LoginRedisKey(userid string) string {
 	return fmt.Sprintf("login_%s", userid)
 }
@@ -207,7 +206,7 @@ func (a SortBy) Less(i, j int) bool {
 }
 
 // ture  倒序3, 2, 1
-//fmt.Println(m)
+// fmt.Println(m)
 func SortData(data interface{}, sortkey string, reverse bool) {
 	//func SortData(data interface{}, sortkey string, reverse bool) {
 	var db []map[string]interface{}
@@ -281,13 +280,14 @@ const (
 
 // IsOnTheWhitelist 是否在白名单
 func IsOnTheWhitelist(session *httpsession.Session) (flag bool, err error) {
-	mgoUserId := util.ObjToString(session.Get("mgoUserId"))
+	getsession := session.GetMultiple()
+	mgoUserId := util.ObjToString(getsession["mgoUserId"])
 	flag, err = redis.Exists(RedisPoly, fmt.Sprintf(WhitelistRedisKey, mgoUserId))
 	if err == nil && flag {
 		return
 	}
 	// 	mongoid 在白名单中没有查到 再去查职位id有没有在白名单里面
-	userId := util.ObjToString(session.Get("userId"))
+	userId := util.ObjToString(getsession["userId"])
 	flag, err = redis.Exists(RedisPoly, fmt.Sprintf(WhitelistRedisKey, userId))
 	return
 }