Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

common/src/qfw/util/encrypt_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"log"
+	"strconv"
 	"testing"
 	"time"
 )
@@ -21,7 +22,7 @@ func Test_sim(t *testing.T) {
 	//s2 := "GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkbLj4zMRYDPRs5ATVZOxccPAkzFxw7CCpEFj41QlRAQFdFXlRMQVZcHRIbBgsWBxYcFQwEBwoa"
 
 	//s3 := "RFYoal5bCFdXWQoQB0JuWwlXAQFZCUVfFj4JMFtT"
-	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8,uid,123456,wxpushlist"
+	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8,uid,123456,swordfishaction"
 	se := SimpleEncrypt{Key: "topnet"}
 	log.Println(se.EncodeString(s4))
 	log.Println(se.DecodeString("GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkSEkMWCEkHAwACCgMdBwcRDREdGwE=566666666666666"))
@@ -31,15 +32,7 @@ func Test_sim(t *testing.T) {
 
 	log.Println(GetSubDay(time.Now().AddDate(0, 1, 0).Unix()))
 
-	strs := []string{"1", "2"}
-	log.Println(func(tmps []string) []interface{} {
-		res := make([]interface{}, len(tmps))
-		for k, v := range tmps {
-			res[k] = v
-		}
-		log.Println("--------", res)
-		return res
-	}(strs[1:]))
+	log.Println("/mobile/sess/" + se.EncodeString("oJULtwzXo6EFV1Ah-XeyRBimXGM8"+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "/" + "uid" + "/" + "563acdbe36b82b1df0000002" + "/aa")
 
 }
 

core/src/qfw/member/memberindex.go

@@ -60,14 +60,12 @@ func (m *MemberIndex) Sess(str string) error {
 					UpdateCookieSession(m.Action, "s_nickname", false, person)
 					actionurl := util.ObjToString(coreconfig.MessageConfig[str[3]])
 					if actionurl != "" {
-						log.Println("len(strs)", len(strs))
 						if len(strs) > 1 {
 							actionurl = fmt.Sprintf(actionurl, func(tmps []string) []interface{} {
 								res := make([]interface{}, len(tmps))
 								for k, v := range tmps {
 									res[k] = v
 								}
-								log.Println("--------", res)
 								return res
 							}(strs[1:])...)
 						}

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 20:24:52"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 20:24:52"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-25 16:16:21"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-25 16:16:21"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/wxswordfish/style.css

@@ -96,10 +96,7 @@ img{
 	background-image: url("/wxswordfish/images/off.png");
 	background-size: 100% 100%;
 }
-.operation>.parent-node>.rule{
-	background: url("/wxswordfish/images/right.png") no-repeat 10px;
-	background-size: 30% 50%;
-}
+
 .rule-content div{
 	height:30px;
 }

core/src/web/templates/service/list.html

@@ -258,8 +258,7 @@
 			{{end}}	
 			{{if gt (len .T.data) 0}}
 			<!--分页-->
-			<div>
-				<div>&nbsp;</div>
+			<div class="f-clear">
 				<div class="text-center" style="margin-top: -20px;">
 					<!--页码信息-->
 					<!--页码信息-->

core/src/web/templates/swordfish/wxrssset.html

@@ -69,7 +69,7 @@
 		<li class="parent-node">
 			<img src="/wxswordfish/images/feerule.png">
 			收费规则
-			<span class="rule" id="rule"></span>
+			<span style="right:0"><img src="/wxswordfish/images/right.png" style="width: 10px;height: 17px;float: right;"></span>
 		</li>
 	</ul>
 	<!--剑鱼服务协议-->