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

config_formal/publicapply_172.17.148.50/db.json

@@ -64,7 +64,15 @@
 		"passWord": "Topnet123",
 		"maxOpenConns":120,
 		"maxIdleConns":80
-		}
+		},
+	    "entnichePush": {
+	        "dbName": "jianyu",
+		"address": "172.17.4.202:3306",
+		"userName": "root",
+		"passWord": "Topnet123",
+		"maxOpenConns":300,
+		"maxIdleConns":80
+	    }
     },
     "bdcollection":"bdcollection",
     "bdlabel":"bdlabel"

src/jfw/filter/filter.go

@@ -1,6 +1,7 @@
 package filter
 
 import (
+	"jfw/jyutil"
 	//"jfw/jyutil"
 	"net/http"
 	"time"
@@ -17,9 +18,9 @@ type Filter struct {
 }
 
 func (f *Filter) Do(w http.ResponseWriter, r *http.Request) bool {
-	//session := xweb.RootApp().SessionManager.Session(r, w)
-	//getSession := session.GetMultiple()
-	/*if !(&logFilter{w, r, session, getSession, make(map[string]interface{})}).Do() {
+	session := xweb.RootApp().SessionManager.Session(r, w)
+	getSession := session.GetMultiple()
+	if !(&logFilter{w, r, session, getSession, make(map[string]interface{})}).Do() {
 		return false
 	}
 	if !(&jyutil.SessionKeep{w, r, session, getSession, make(map[string]interface{})}).Do() {
@@ -33,6 +34,6 @@ func (f *Filter) Do(w http.ResponseWriter, r *http.Request) bool {
 	}
 	if !(&pcFilter{w, r, session, getSession}).Do() {
 		return false
-	}*/
+	}
 	return true
 }

src/jfw/modules/publicapply/src/active/21yearEndReport.go

@@ -146,7 +146,7 @@ func getRandom(userId string, t int64) int32 {
 
 //checkUserIsSubscribe 检查用户是否关注
 func checkUserIsSubscribe(openid string) bool {
-	if openid == "" {
+	if openid != "" {
 		user, ok := db.Mgo.FindOneByField("user", map[string]interface{}{
 			"i_appid":    2,
 			"s_m_openid": openid,

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

@@ -32,7 +32,6 @@ type SubscribePush struct {
 func (sp *SubscribePush) VipSwitch() {
 	userId, _ := sp.GetSession("userId").(string)
 	//entUserId := util.IntAll(sp.GetSession("entUserId"))
-	fmt.Println("11111111111",util.IntAll(sp.GetSession("entUserId")))
 	rData, errMsg := func() (interface{}, error) {
 		if userId == "" {
 			return nil, fmt.Errorf("未登录")
@@ -40,9 +39,8 @@ func (sp *SubscribePush) VipSwitch() {
 		switchOk := false
 		vt := sp.GetString("vt")
 		if vt == "" {
-			vt=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+			vt = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 			sp.SetSession(jy.SwitchService.SessionKey, vt)
-			fmt.Println("1231233",vt)
 		} else if vt == jy.SubVipFlag {
 			vipMsg := jy.GetBigVipUserBaseMsg(userId, db.Mysql, db.Mgo)
 			if vipMsg.VipStatus <= 0 {
@@ -87,11 +85,9 @@ func (sp *SubscribePush) HasPushHistory() {
 
 	vipType := sp.GetString("vt")
 	if vipType == "" { //默认取已切换的企业
-		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 	}
-	fmt.Println("12312",vipType,userId,	util.IntAll(sp.GetSession("entUserId")))
-	if vipType==jy.SwitchService.Entniche{
-		fmt.Println(util.IntAll(sp.GetSession("entUserId")))
+	if vipType == jy.SwitchService.Entniche {
 		userId = fmt.Sprint(util.IntAll(sp.GetSession("entUserId")))
 	}
 	go entity.HistoryPush.UpdateUserPushUnread(userId, vipType)
@@ -208,9 +204,9 @@ func (sp *SubscribePush) HistoryPaging() {
 	}
 	vipType := sp.GetString("vt")
 	if vipType == "" { //默认取已切换的企业
-		vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 	}
-	if vipType==jy.SwitchService.Entniche{
+	if vipType == jy.SwitchService.Entniche {
 		userId = fmt.Sprint(util.IntAll(sp.GetSession("entUserId")))
 	}
 	pageNum, _ := sp.GetInteger("pageNum")
@@ -272,7 +268,7 @@ func (sp *SubscribePush) SetRead() error {
 	}
 	vipType := sp.GetString("vt")
 	if vipType == "" { //默认取已切换的企业
-		vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 	}
 	if userId := util.ObjToString(sp.GetSession("userId")); userId != "" {
 		if vipType == jy.SwitchService.Member {
@@ -303,7 +299,7 @@ func (sp *SubscribePush) GetPushCount() error {
 	if userId != "" {
 		vipType := sp.GetString("vt")
 		if vipType == "" { //默认取已切换的企业
-			vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+			vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 
 		}
 		matchway, _ := sp.GetInteger("matchway")
@@ -322,7 +318,7 @@ func (sp *SubscribePush) GetPushAllCount() error {
 		index, _ := sp.GetInteger("index")
 		vipType := sp.GetString("vt")
 		if vipType == "" { //默认取已切换的企业
-			vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+			vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 		}
 		sp.ServeJson(map[string]interface{}{
 			"count": entity.SubViewDatasCount(userId, vipType, sp.GetString("item"), index),

src/web/staticres/js/login.js

@@ -862,7 +862,7 @@ $(function(){
                   break
                 }
                 case 'forge': {
-                    $.post("/phone",{
+                    $.post("/phone/forgetPwd",{
                         reqType:"sendIdentCode",
                         phone:$(".forgetpwd_page .login-dig-input-box [name='forge_phone']").val(),
                         code:$(".forgetpwd_page .login-dig-input-box [name='forge_code']").val()