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

core/src/qfw/active/activemanage.go

@@ -64,7 +64,6 @@ func (a *Activemanage) Luckdraw(activecode, id string) error {
 		if *u != nil {
 			if ret := redis.Get("other", "cj_"+openid+"_"+time.Now().Format("2006_01_02")); ret == nil {
 				//a.T = *u
-				fmt.Println("ret:::::::::", ret, "33333333333", time.Now().Format("2006_01_02"))
 				a.T["flog"] = "A"
 				Tm := time.Now().AddDate(0, 0, 1)
 				if ret := redis.Get("other", "cj_"+openid+"_"+Tm.Format("2006_01_02")); ret == nil {
@@ -102,7 +101,6 @@ func (a *Activemanage) Getluckdraw() error {
 		if *u != nil {
 			if ret := redis.Get("other", "cj_"+openid+"_"+time.Now().Format("2006_01_02")); ret == nil {
 				//a.T = *u
-				fmt.Println("ret22:::::::::", ret)
 				a.T["flog"] = "A"
 				a.T["msg"] = "小主莫贪心，每天只有一次抽奖机会呦！分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 				return a.Write(`{"flog":"` + flog + `","msg":"` + msg + `"}`)

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-26 09:21:12"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-26 09:21:12"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-26 10:41:42"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-26 10:41:42"}},"marketisstart":true,"marketrate":300}