Merge branch 'dev2.0.1' of ssh://192.168.3.207:10022/qmx/jy into dev2.0.1

src/jfw/modules/weixin/src/wx/checkuser.go

@@ -65,11 +65,23 @@ func NilCheck(c *CheckJYUser) {
 
 func (c *CheckJYUser) Init() {
 	//load mgo data into cache
+	log.Println("load wx user start!")
+	err := c.GetWxUser("")
+	checkTime := time.Now().Unix()
+	if err != nil {
+		log.Println("wx load err ,check exit.")
+		c.binit = false
+		return
+	}
 	func() {
 		log.Println("load mgo user start!")
 		sess := tools.MQFW.GetMgoConn()
 		defer tools.MQFW.DestoryMongoConn(sess)
-		q := &map[string]interface{}{"i_appid": 2}
+		q := &map[string]interface{}{
+			"i_appid": 2,
+			"l_registedate": map[string]interface{}{
+				"$lte": checkTime,
+			}}
 		sum := tools.MQFW.Count("user", q)
 		it := sess.DB(tools.MQFW.DbName).C("user").Find(q).Select(&map[string]interface{}{
 			"s_m_openid": 1,
@@ -85,21 +97,14 @@ func (c *CheckJYUser) Init() {
 			}
 			c.MgoMap[util.ObjToString(tmp["s_m_openid"])] = ipush
 		}
-		if c.MgoTotal >= sum && c.MgoXTotal > 10 {
+		if c.MgoTotal >= sum-5 && c.MgoXTotal > 67000 && sum > 67000 {
 			c.binit = true
 		}
 		log.Println("load mgo user success!")
 	}()
 
 	func() {
-		log.Println("load wx user start!")
-		err := c.GetWxUser("")
-		if err != nil {
-			log.Println("wx load err ,check exit.")
-			c.binit = false
-			return
-		}
-		if c.WxTotal < 10 || math.Abs(float64(c.WxTotal-c.MgoXTotal)) > 500 || math.Abs(float64(len(c.WxMap)-c.WxTotal)) > 20 {
+		if c.WxTotal < 67000 || math.Abs(float64(c.WxTotal-c.MgoXTotal)) > 1500 || math.Abs(float64(len(c.WxMap)-c.WxTotal)) > 20 {
 			c.binit = false
 			log.Println("load wx user failed!")
 		} else {
@@ -132,8 +137,13 @@ func (c *CheckJYUser) CheckAndRepair() {
 		for k, v := range c.WxToMgo {
 			if v == 0 {
 				//create user
-				user, _ := Mux.GetUserInfo(k)
-				saveUser(user, "-10")
+				user, err := Mux.GetUserInfo(k)
+				if err != nil {
+					log.Println("获取用户出错", k, err)
+				} else {
+					log.Println("获取用户", k, user)
+					saveUser(user, "-10")
+				}
 			} else {
 				//change user ispush
 				tools.MQFW.Update("user", "{'s_m_openid':'"+k+"'}", &map[string]interface{}{"$set": &map[string]interface{}{"i_ispush": 1}}, false, false)

src/jfw/modules/weixin/src/wx/wx.go

@@ -1098,7 +1098,7 @@ func WebCheckUser(w http.ResponseWriter, r *http.Request) {
 		log.Println("web check wxuser!")
 		checkFlag = 0
 		go func() {
-			time.Sleep(30 * time.Minute)
+			time.Sleep(10 * time.Minute)
 			checkFlag = 1
 		}()
 		StartCheckJob()

src/web/staticres/js/login.js

@@ -43,7 +43,7 @@ var initEventHandle = function(){
 	ws.onerror = function(e){
 		clearInterval(loginfg);
 		createWebSocket(wsUrl);
-		JYLogin(pageshareid,kopshareid,mynum);
+		JYLogin(mynum);
 	}
 //	ws.onopen = function(e) {
 //		if(ws.readyState==1){
@@ -58,20 +58,23 @@ function reconnect(url) {
     }, 2000);
 }
 //websocket查看用户是否登录
-var JYLogin = function(shareid,kopshareid,num){
+var JYLogin = function(num){
 	clearInterval(loginfg)
 	loginfg = setInterval(function(){
 		jylgi++;
 		//console.log(jylgi+"-----")
-		if(jylgi>720){
-			getNewShareId(mynum);
+		if(jylgi>12*60){
+			getNewShareId(num);
 			jylgi = 0;
 		}
 	},1000)
+	SendMsg();
+}
+var SendMsg = function(){
 	//向后台发送websocket数据
 	if (window["WebSocket"]){
 		if(ws.readyState==1){
-			//console.log("发送："+pageshareid)
+			//console.log("发送："+pageshareid+"___"+kopshareid)
 			ws.send(pageshareid+"___"+kopshareid);
 		}
 	}
@@ -160,7 +163,7 @@ var getNewShareId = function(num){
 			}
 			setTimeout(function(){
 				if(!loginflag){
-					JYLogin(pageshareid,kopshareid,num);
+					JYLogin(num);
 				}
 			},500);
 		}

src/web/templates/pc/biddetail.html

@@ -434,6 +434,7 @@ var entProListShowFlag = false;
 var titleCopyDec = "";
 $(function(){
 	haslogin({{.T.logid}},{{.T.obj.projectname}},"D");
+	JYLogin({{.T.logid}})
     if (_loop){
         console.log("-",_loop)
         return;