cc

src/jfw/front/pchelper.go

@@ -16,8 +16,8 @@ type Login struct {
 	*xweb.Action
 	login             xweb.Mapper `xweb:"/jypc/login"`            //pc助手登录
 	getSubscribeToken xweb.Mapper `xweb:"/jypc/getST"`            //获取订阅记录token
+	toPcPushView      xweb.Mapper `xweb:"/jypc/toPcPushView"`     //跳转到订阅记录页面
 	pcPushView        xweb.Mapper `xweb:"/jypc/pcPushView"`       //订阅记录列表
-	pcPushViewPaging  xweb.Mapper `xweb:"/jypc/pcPushViewPaging"` //订阅记录列表-分页
 }
 
 func init() {
@@ -102,32 +102,6 @@ func (l *Login) Login() error {
 	return nil
 }
 
-//发送验证码
-func SendIdentCode(phone string, session *httpsession.Session) bool {
-	lastSentTime, _ := session.Get("identCodeTime").(int64)
-	//60秒之内不允许重复发
-	if lastSentTime > 0 && time.Now().Unix()-lastSentTime <= 60 {
-		return false
-	}
-	s_ranNum := util.GetRandom(6) //生成随机数
-	session.Set("identCodeValue", s_ranNum)
-	session.Set("identCodeKey", phone)
-	session.Set("identCodeTime", time.Now().Unix())
-	//发送短信
-	param := make(map[string]string)
-	param["code"] = s_ranNum
-	log.Println("验证码", phone, s_ranNum)
-	jyutil.SendSMS("2175916", phone, param)
-	return true
-}
-
-//删除短信验证码有关的session
-func deleteIdentSession_(session *httpsession.Session) {
-	session.Del("identCodeValue")
-	session.Del("identCodeKey")
-	session.Del("identCodeTime")
-}
-
 func (l *Login) GetSubscribeToken() error {
 	mac := l.GetString("mac")
 	token := l.GetString("token")
@@ -145,16 +119,18 @@ func (l *Login) GetSubscribeToken() error {
 	return nil
 }
 
+func (l *Login) ToPcPushView() error {
+	l.SetSession("pc_s_m_openid",l.GetString("openid"))
+	return l.Render("/pcHelper/pushView.html", &l.T)
+}
+
 func (l *Login) PcPushView() error {
 	defer util.Catch()
 	lasttime, _ := l.GetInt("lasttime")
-	if lasttime == 0 {
-		lasttime = 1
+	myopenid, _ := l.GetSession("pc_s_m_openid").(string)
+	if myopenid == "" {
+		myopenid = "oilZj0ZXGqqOfirMHt8MRT3b4U"
 	}
-	lasttime_ := lasttime
-	//myopenid, _ := l.GetSession("s_m_openid").(string)
-	myopenid := l.GetString("openid")     //"oilZj0ZXGqqOfirMHt8MRT3b4U-M"
-	fmt.Println("pppppppppppppppp",lasttime,myopenid)
 	res := map[string]interface{}{}
 	res["success"] = false
 	if myopenid != "" && lasttime > 0 {
@@ -163,43 +139,39 @@ func (l *Login) PcPushView() error {
 		}
 		thistime, list := getHistorypush(lasttime, 0, myopenid, nil, 0)
 		if list != nil && len(*list) > 0 {
-			fmt.Println("=====================",list)
-			l.T["success"] = true
-			l.T["data"] = &list
-			l.T["thistime"] = thistime
-
 			res["success"] = true
 			res["data"] = &list
 			res["thistime"] = thistime
 		}
 	}
-	if lasttime_ == 1 {
-		return l.Render("/pcHelper/pushView.html", &l.T)
-	}else {
-		l.ServeJson(&res)
-		return nil
-	}
+	l.ServeJson(&res)
+	return nil
 }
 
-func (l *Login) PcPushViewPaging() error {
-	defer util.Catch()
-	lasttime, _ := l.GetInt("lasttime")
-	myopenid, _ := l.GetSession("s_m_openid").(string)
-	res := map[string]interface{}{}
-	res["success"] = false
-	if myopenid != "" && lasttime > 0 {
-		if lasttime == 1 {
-			lasttime = time.Now().Local().Unix()
-		}
-		thistime, list := getHistorypush(lasttime, 0, myopenid, nil, 0)
-		if list != nil && len(*list) > 0 {
-			res["success"] = true
-			res["data"] = &list
-			res["thistime"] = thistime
-		}
+//发送验证码
+func SendIdentCode(phone string, session *httpsession.Session) bool {
+	lastSentTime, _ := session.Get("identCodeTime").(int64)
+	//60秒之内不允许重复发
+	if lastSentTime > 0 && time.Now().Unix()-lastSentTime <= 60 {
+		return false
 	}
-	l.ServeJson(&res)
-	return nil
+	s_ranNum := util.GetRandom(6) //生成随机数
+	session.Set("identCodeValue", s_ranNum)
+	session.Set("identCodeKey", phone)
+	session.Set("identCodeTime", time.Now().Unix())
+	//发送短信
+	param := make(map[string]string)
+	param["code"] = s_ranNum
+	log.Println("验证码", phone, s_ranNum)
+	jyutil.SendSMS("2175916", phone, param)
+	return true
+}
+
+//删除短信验证码有关的session
+func deleteIdentSession_(session *httpsession.Session) {
+	session.Del("identCodeValue")
+	session.Del("identCodeKey")
+	session.Del("identCodeTime")
 }
 
 //订阅记录token

src/jfw/modules/pc/server/src/push/push.go

@@ -6,6 +6,8 @@ package push
 import (
 	"errors"
 	"net/rpc"
+	"encoding/json"
+	"log"
 )
 
 func push(code string, json interface{}) bool {
@@ -28,15 +30,21 @@ type (
 )
 
 
-func (s *Service) PushMsg(request *PushRequest, repl *PushResponse) error {
-	ok := push(request.ClientCode, request)
+func (s *Service) PushMsg(request *[]byte, repl *string) error {
+	ps := &PushRequest{}
+	err := json.Unmarshal(*request,&ps)
+	if err != nil {
+		*repl = "n"
+		return errors.New("推送参数异常")
+	}
+	ok := push(ps.ClientCode, ps)
 	if ok {
-		repl.Ok = true
+		*repl = "y"
 		return nil
 	} else {
-		repl.Ok = false
-		//TODO 存入redis日志，客户端下次上线自动提醒，7日有效期。 。。
-		return errors.New("客户端不在线")
+		*repl = "n"
+		log.Println("客户不在线")
+		return nil
 	}
 }