添加抽奖验证码

common/src/qfw/util/encrypt_test.go

@@ -22,9 +22,10 @@ func Test_sim(t *testing.T) {
 	//s2 := "GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkbLj4zMRYDPRs5ATVZOxccPAkzFxw7CCpEFj41QlRAQFdFXlRMQVZcHRIbBgsWBxYcFQwEBwoa"
 
 	//s3 := "RFYoal5bCFdXWQoQB0JuWwlXAQFZCUVfFj4JMFtT"
-	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8,uid,123456,swordfishaction"
+	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8,uid,123456,wxpushlist"
 	se := SimpleEncrypt{Key: "topnet"}
 	log.Println("=====", se.EncodeString(s4))
+	log.Println("=====", se.EncodeString(",1349385977,ASD"))
 	log.Println("---", se.DecodeString("GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkBHQtcX1FBR1hJWldCREMHFhUBBwccBxYA"))
 	now := time.Now()
 	tom := time.Date(now.Year(), now.Month(), now.Day(), 18, 0, 0, 0, time.Local)

core/src/timetask.json

@@ -1 +1,5 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}
+<<<<<<< HEAD
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}
+=======
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-26 17:33:46"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-26 17:33:46"}},"marketisstart":true,"marketrate":300}
+>>>>>>> 4ae19393438c02869446c485a2d9a0593fab86f7

core/src/web/templates/common/hotdemand.html

@@ -11,7 +11,7 @@
 						<ul style="    padding: 15px 0 20 10px;">
 							<li class="a-com-title" style="height:26px;"><div><a href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
 							<li style="height:26px;color:#FF5A5F;font-size:14px;font-weight:600;overflow: hidden;" class="a-com-type">{{$v.o_extend.type}}</li>
-							<li style="height:26px;">{{if eq $v.o_extend.status "1"}}<img src="/images/u252.png">{{else}}<img src="/images/u288.png">{{end}}</li>
+							<li style="height:26px;"><img src="/images/u288.png"></li>
 							<li class="a-com-name" style="height:26px;"><div>{{$v.o_extend.entName}}</div></li>
 						</ul>
 					</li>

push/src/qfw/push/rpcpush/rpcpush.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"qfw/push/bid"
 	"qfw/push/dopush"
+	"qfw/util"
 	qrpc "qfw/util/rpc"
 	"time"
 )
@@ -15,22 +16,24 @@ type PushInfo struct {
 var PushInfoScopeDays int
 
 func (p *PushInfo) PushMsg(data *qrpc.PushData, Reply *int) error {
-	log.Println("dddddddd", data)
-	for k, v := range data.PushType {
-		//昨天到今天的数据
-		pj := dopush.Pjob{
-			MaxPushSize: bid.MaxPushSize,
-			Stype:       k,
-			StypeName:   v,
+	log.Println("rpc_data", data)
+	util.Try(func() {
+		for k, v := range data.PushType {
+			//昨天到今天的数据
+			pj := dopush.Pjob{
+				MaxPushSize: bid.MaxPushSize,
+				Stype:       k,
+				StypeName:   v,
+			}
+			now := time.Now()
+			tom := time.Date(now.Year(), now.Month(), now.Day()-PushInfoScopeDays, 0, 0, 0, 0, time.Local)
+			b := pj.DoPush(data.Mopenid, fmt.Sprintf("%d days", PushInfoScopeDays), 2, tom.Unix())
+			if b {
+				*Reply = 1
+			} else {
+				*Reply = 0
+			}
 		}
-		now := time.Now()
-		tom := time.Date(now.Year(), now.Month(), now.Day()-PushInfoScopeDays, 0, 0, 0, 0, time.Local)
-		b := pj.DoPush(data.Mopenid, fmt.Sprintf("%d days", PushInfoScopeDays), 2, tom.Unix())
-		if b {
-			*Reply = 1
-		} else {
-			*Reply = 0
-		}
-	}
+	}, func(e interface{}) {})
 	return nil
 }

spider2/src/client/ecps/ln/parse.go

@@ -114,6 +114,10 @@ func addJob(tmplist []interface{}) {
 				cm["query"] = tmp["Inv"]
 			}
 			if cm["query"] != nil && cm["query"] != "" && len(cm["query"].(string)) > 5 {
+				//防止死循环
+				if cm["query"] == infoMap["CerNo"] || cm["query"] == infoMap["EntName"] {
+					continue
+				}
 				cms := *new(com.CmdMsg)
 				cms.Nodetype = com.NODE_TYPE_ECPS
 				cms.Param = cm

spider2/src/client/ecps/ln/spider.go

@@ -85,26 +85,18 @@ func downList() {
 			}
 			ent := *mongodb.FindOne("entintime", `{"$and":[{"intime":{"$gt":`+fmt.Sprint(time.Now().Unix()-int64(rate)*24*60*60)+`}},{"$or":[{"RegNo":"`+fmt.Sprint(tmp["query"])+`"},{"EntName":"`+fmt.Sprint(tmp["query"])+`"}]}]}`)
 			if ent != nil {
-<<<<<<< HEAD
 				log.Println(ent["EntName"], ent["RegNo"], ",根据配置频率跳过")
 				putLogs(":"+fmt.Sprint(ent["EntName"])+","+fmt.Sprint(ent["RegNo"])+",根据配置频率跳过", 1)
-=======
-				log.Println(fmt.Sprint(ent["EntName"]) + ",根据配置频率跳过")
-				putLogs(":"+fmt.Sprint(ent["EntName"])+",根据配置频率跳过", 1)
->>>>>>> release
+
 				Lists.Remove(e)
 				continue
 			}
 			b, info := downloadContent(tmp)
 			Lists.Remove(e)
 			if b {
-<<<<<<< HEAD
 				log.Println("成功下载：", info["EntName"], info["RegNo"])
 				putLogs("成功下载："+fmt.Sprint(info["EntName"])+","+fmt.Sprint(info["RegNo"]), 1)
-=======
-				log.Println("成功下载：", info["EntName"])
-				putLogs("成功下载："+fmt.Sprint(info["EntName"]), 1)
->>>>>>> release
+
 			} else {
 				log.Println("下载失败：", tmp)
 				putLogs("下载失败："+fmt.Sprint(tmp), 1)

spider2/src/server/rpc.go

@@ -23,7 +23,6 @@ const (
 	RUNNING         = iota
 	PASS
 	STOP
-	OFFLINE //掉线
 )
 
 //一个节点
@@ -33,6 +32,7 @@ type Node struct {
 	Descript       string
 	Dtype          string     //节点分类
 	Status         int        //状态
+	IsOnline       bool       //是否在线
 	Logs           *list.List //日志
 	Command        *list.List //命令
 	LastAccesstime int64      //最后访问时间
@@ -59,7 +59,7 @@ func (ss *SpiderServer) Join(p com.JoinMsg, r *com.SimpleReturnMsg) error {
 	Mirror[p.Code] = &Node{Name: p.Name,
 		Code: p.Code, Descript: p.Descript,
 		Dtype: p.Dtype, LastAccesstime: lasttime,
-		Status: RUNNING, Logs: logs, Command: cmd}
+		Status: RUNNING, IsOnline: true, Logs: logs, Command: cmd}
 	lock.Unlock()
 	return nil
 }
@@ -153,13 +153,20 @@ func initRpc(port string) {
 func Gc() {
 	timestamp := time.Now().Unix()
 	lock.Lock()
-	for k, v := range Mirror {
+	for _, v := range Mirror {
 		log.Println(v.Name, "Status:", v.Status)
 		remain := timestamp - v.LastAccesstime
-		if remain > 10 { //5分钟掉线删除
-			delete(Mirror, k)
-		} else if remain > ACTIVECHECKTIME {
-			v.Status = OFFLINE
+		/*
+			if remain > 30 { //30秒钟掉线删除
+				delete(Mirror, k)
+			} else if remain > ACTIVECHECKTIME {
+				v.Status = OFFLINE
+			}
+		*/
+		if remain > ACTIVECHECKTIME {
+			v.IsOnline = false
+		} else {
+			v.IsOnline = true
 		}
 	}
 	lock.Unlock()