renzheng 9 år sedan
förälder
incheckning
c00eb72ee8

+ 1 - 1
common/src/qfw/util/encrypt_test.go

@@ -22,7 +22,7 @@ func Test_sim(t *testing.T) {
 	//s2 := "GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkbLj4zMRYDPRs5ATVZOxccPAkzFxw7CCpEFj41QlRAQFdFXlRMQVZcHRIbBgsWBxYcFQwEBwoa"
 
 	//s3 := "RFYoal5bCFdXWQoQB0JuWwlXAQFZCUVfFj4JMFtT"
-	s4 := "oJULtwzXo6EFV//////??????----oJULtwzXsLVHoDeXBEWOXCkME9p4,oZQC_s_DfLpFKIKIP2TpiR-16Glg,1453788982,swordfishaction--1Ah-Xey,_R_B/i?mXGM8,uid,123456,swordfishaction"
+	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8,uid,123456,swordfishaction"
 	se := SimpleEncrypt{Key: "topnet"}
 	log.Println("=====", se.EncodeString(s4))
 	log.Println("---", se.DecodeString("GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkBHQtcX1FBR1hJWldCREMHFhUBBwccBxYA"))

+ 1 - 1
core/src/message.json

@@ -5,7 +5,7 @@
 	"entsearchaction":"/wx/search/enterprise/ent.html",
 	"lawsearchaction":"/law/qfw/index",
 	"msiteaction":"/ent/wsite/edit",
-	"wxpushlist":"/wxpush/bid/%s/%s/%s",
+	"wxpushlist":"/wxpush/bidinfo/%s",
 	"indentify":{
 		"success":{
 			"result":"企业认证",

+ 0 - 1
core/src/qfw/member/memberindex.go

@@ -38,7 +38,6 @@ func init() {
 }
 
 func (m *MemberIndex) Sess(str string) error {
-
 	util.Try(func() {
 		strs := strings.Split(str, "__")
 		str := strings.Split(sewx.DecodeString(strs[0]), ",")

+ 16 - 15
core/src/qfw/mobile/mobile.go

@@ -6,21 +6,22 @@ import (
 
 type Mobile struct {
 	*xweb.Action
-	index         xweb.Mapper `xweb:"/ent/(.*)/index"`
-	search        xweb.Mapper `xweb:"/ent/(.*)/search"`
-	detail        xweb.Mapper `xweb:"/ent/(.*)/detail/(.*)/(.*)"`
-	pageerror     xweb.Mapper `xweb:"/ent/(.*)/505"`
-	guide         xweb.Mapper `xweb:"/swordfish/guide"`
-	share         xweb.Mapper `xweb:"/swordfish/share/([^.]*)"`
-	wxrssset      xweb.Mapper `xweb:"/swordfish/page"`
-	getMyCredit   xweb.Mapper `xweb:"/member/credit/getcredit"`
-	swordfishPay  xweb.Mapper `xweb:"/member/credit/swordfishpay"`
-	msgSet        xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
-	ajaxReq       xweb.Mapper `xweb:"/member/swordfish/ajaxReq"`
-	advise        xweb.Mapper `xweb:"/mobile/advise"`
-	adviseSave    xweb.Mapper `xweb:"/mobile/advisesave"`
-	wxpushList    xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表
-	wxpushAjaxReq xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
+	index          xweb.Mapper `xweb:"/ent/(.*)/index"`
+	search         xweb.Mapper `xweb:"/ent/(.*)/search"`
+	detail         xweb.Mapper `xweb:"/ent/(.*)/detail/(.*)/(.*)"`
+	pageerror      xweb.Mapper `xweb:"/ent/(.*)/505"`
+	guide          xweb.Mapper `xweb:"/swordfish/guide"`
+	share          xweb.Mapper `xweb:"/swordfish/share/([^.]*)"`
+	wxrssset       xweb.Mapper `xweb:"/swordfish/page"`
+	getMyCredit    xweb.Mapper `xweb:"/member/credit/getcredit"`
+	swordfishPay   xweb.Mapper `xweb:"/member/credit/swordfishpay"`
+	msgSet         xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
+	ajaxReq        xweb.Mapper `xweb:"/member/swordfish/ajaxReq"`
+	advise         xweb.Mapper `xweb:"/mobile/advise"`
+	adviseSave     xweb.Mapper `xweb:"/mobile/advisesave"`
+	wxpushList     xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表
+	wxpushListInfo xweb.Mapper `xweb:"/wxpush/bidinfo/(.*)"`       //推送列表
+	wxpushAjaxReq  xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
 }
 
 func init() {

+ 12 - 0
core/src/qfw/mobile/wxmenu.go

@@ -324,6 +324,18 @@ func (m *Mobile) AjaxReq() error {
 
 //推送列表
 func (m *Mobile) WxpushList(s_m_openid string, _id string, msgid string) error {
+	/**
+	go func() {
+		mongodb.Update("message", `{"_id":"`+msgid+`"}`, `{"$set":{"i_status":1}}`, false, false)
+	}()
+	**/
+	m.T["data"] = *mongodb.FindById("wxpush", _id, `{"s_content":1,"s_words":1,"a_visitedindex":1,"a_publishtime":1,"s_type":1}`)
+	m.T["_id"] = _id
+	return m.Render("/swordfish/wxpush.html", &m.T)
+}
+
+//推送列表
+func (m *Mobile) WxpushListInfo(_id string) error {
 	/**
 	go func() {
 		mongodb.Update("message", `{"_id":"`+msgid+`"}`, `{"$set":{"i_status":1}}`, false, false)

+ 1 - 1
push/src/qfw/push/dopush/dopush.go

@@ -233,6 +233,6 @@ func SendWeixin(k *push.MemberInterest, TITLE, ShortTitle, str, stype string, no
 		Date:    wxDate,
 		Service: "剑鱼君",
 		//Url:     push.PushConfig["bidViewDomain"].(string) + "/wxpush/bid/" + k.Openid + "/" + wid + "/aa"})
-		Url: push.PushConfig["bidViewDomain"].(string) + "/mobile/sess/" + se.EncodeString(k.Openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "__" + k.Openid + "__" + wid + "__aa"})
+		Url: push.PushConfig["bidViewDomain"].(string) + "/mobile/sess/" + se.EncodeString(k.Openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "__" + wid})
 
 }