Merge branch 'dev4.6.2.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.1

src/jfw/front/vipsubscribe.go

@@ -9,6 +9,7 @@ import (
 	"log"
 	"net/url"
 	"qfw/util"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"time"
 
@@ -125,6 +126,11 @@ func (s *Subscribepay) ToSetInfoTypePage() {
 
 //订阅设置
 func (s *Subscribepay) ToSetPage() {
+	userid := util.ObjToString(s.GetSession("userId"))
+	vipMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
+	if vipMsg.VipStatus <= 0 && vipMsg.Status <= 0 && isInTSguide(userid) { //仅免费用户跳转向导页面
+		s.Redirect("/front/tenderSubscribe/guide")
+	}
 	nowTime := time.Now().Unix()
 	if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 		s.T["isLiveActive"] = true

src/jfw/modules/app/src/app/front/vipsubscribe.go

@@ -113,6 +113,10 @@ func (s *Subscribepay) ToSetPage() {
 		s.Redirect("/jyapp/big/page/init") //跳转至首次初始化页面
 		return
 	}
+	//仅免费用户跳转向导页面
+	if bigBaseMsg.Status < 0 && bigBaseMsg.VipStatus < 0 && isInTSguide(userid) {
+		s.Redirect("/jyapp/tenderSubscribe/guide")
+	}
 	s.Render("/vipsubscribe/vip_index_new.html")
 }
 

src/jfw/modules/bigmember/src/util/jylog.go

@@ -30,7 +30,7 @@ var LogPath = "./jylog"
 func init() {
 	os.Mkdir(LogPath, os.ModePerm)
 	//默认保留15天内的日志，-1为永久保留
-	// initLog(15)
+	initLog(15)
 }
 
 func initLog(saveDay int) {

src/jfw/modules/common/src/qfw/util/jy/switchService.go

@@ -1,7 +1,6 @@
 package jy
 
 import (
-	"log"
 	. "mongodb"
 	"qfw/util"
 
@@ -31,7 +30,6 @@ type switchService struct {
 func (s *switchService) Get(session *httpsession.Session, m MongodbSim) string {
 	userId, _ := session.Get("userId").(string)
 	v, _ := session.Get(s.SessionKey).(string)
-	log.Println(s.SessionKey, "---v:", v)
 	u, ok := m.FindById("user", userId, `{"i_member_status":1,"i_vip_status":1}`)
 	if ok && u != nil {
 		if i_vip_status := util.IntAll((*u)["i_vip_status"]); v == s.Vip && i_vip_status > 0 {

src/jfw/modules/publicapply/src/adLeague/service/service.go

@@ -48,12 +48,12 @@ func (this *Ad) AdL(typ string) {
 		}
 		defer res.Body.Close()
 		bs, _ := ioutil.ReadAll(res.Body)
-		//log.Println("返回内容:" + string(bs))
+		// log.Println("返回内容:" + string(bs))
 		if len(bs) > 0 {
 			resMap := map[string]interface{}{}
 			err = json.Unmarshal([]byte(bs), &resMap)
 			if err != nil {
-				log.Println("json.unmarshal err", resMap)
+				log.Println("json.unmarshal err", err, resMap)
 			} else {
 				if qu.IntAll(resMap["Code"]) == 1 {
 					return Result{Data: true}

src/jfw/modules/publicapply/src/subscribePush/service/pushList.go

@@ -38,7 +38,6 @@ func (sp *SubscribePush) VipSwitch() {
 		}
 		switchOk := false
 		vt := sp.GetString("vt")
-		log.Println("-----------------", vt)
 		if vt == "" {
 			jy.SwitchService.Get(sp.Session(), db.Mgo)
 		} else if vt == jy.SubVipFlag {
@@ -58,7 +57,6 @@ func (sp *SubscribePush) VipSwitch() {
 		} else {
 			return nil, fmt.Errorf("未知请求")
 		}
-		log.Println(switchOk, "---", sp.GetSession(jy.SwitchService.SessionKey), "-----", jy.SwitchService.SessionKey)
 		return map[string]interface{}{
 			"vt":   util.ObjToString(sp.GetSession(jy.SwitchService.SessionKey)),
 			"flag": switchOk,