Browse Source

二维码修改

wangshan 7 years ago
parent
commit
00fc02b125

+ 4 - 4
src/jfw/front/front.go

@@ -411,11 +411,11 @@ func (f *Front) Followinfo() error {
 	userData["Rparaminfotype"] = f.GetSession("paraminfotype")
 	userData["Rprojectname"] = f.GetSession("projectname")
 	if oldData != nil {
-		redis.Put("sso", "p_userdata_"+se.DecodeString(pid), oldData, 780)
-		redis.Put("sso", "p_userdata_"+se.DecodeString(kid), oldData, 780)
+		redis.Put("sso", "p_userdata_"+se.DecodeString(pid), oldData, 13*60)
+		redis.Put("sso", "p_userdata_"+se.DecodeString(kid), oldData, 13*60)
 	} else {
-		redis.Put("sso", "p_userdata_"+se.DecodeString(pid), userData, 780)
-		redis.Put("sso", "p_userdata_"+se.DecodeString(kid), userData, 780)
+		redis.Put("sso", "p_userdata_"+se.DecodeString(pid), userData, 13*60)
+		redis.Put("sso", "p_userdata_"+se.DecodeString(kid), userData, 13*60)
 	}
 	f.ServeJson(map[string]string{
 		"result": "ok",

+ 0 - 2
src/jfw/front/websocket.go

@@ -27,7 +27,6 @@ func ServeWss(w http.ResponseWriter, r *http.Request) {
 	var openid = ""
 	go func() {
 		for {
-			time.Sleep(1 * time.Second)
 			_, shareData, err := conn.ReadMessage()
 			if err != nil {
 				log.Println("前台socket关闭,后台socket断开并退出循环。。。。")
@@ -88,7 +87,6 @@ func ServeWss(w http.ResponseWriter, r *http.Request) {
 }
 
 //实验室
-
 func QrToLabWss(w http.ResponseWriter, r *http.Request) {
 	defer qutil.Catch()
 	conn, err := upgrader.Upgrade(w, r, nil)

+ 2 - 2
src/jfw/qrmanager/qrcodenum.go

@@ -18,10 +18,10 @@ func (q *QrCodeNum) GetQRCode(action string) (string, string) {
 	var shareData = make(map[string]interface{})
 	shareData["action"] = action
 	if shareidone != "" {
-		redis.Put("sso", "p_shareData_"+shareidone, shareData, 30*60)
+		redis.Put("sso", "p_shareData_"+shareidone, shareData, 15*60)
 	}
 	if shareidtwo != "" {
-		redis.Put("sso", "p_shareData_"+shareidtwo, shareData, 30*60)
+		redis.Put("sso", "p_shareData_"+shareidtwo, shareData, 15*60)
 	}
 	return shareidone, shareidtwo
 }

+ 2 - 2
src/jfw/qrmanager/qrcodestr.go

@@ -18,10 +18,10 @@ func (q *QrCodeStr) GetQRCode(action string) (string, string) {
 	var shareData = make(map[string]interface{})
 	shareData["action"] = action
 	if shareidone != "" {
-		redis.Put("sso", "p_shareData_"+shareidone, shareData, 1800)
+		redis.Put("sso", "p_shareData_"+shareidone, shareData, 30*60)
 	}
 	if shareidtwo != "" {
-		redis.Put("sso", "p_shareData_"+shareidtwo, shareData, 1800)
+		redis.Put("sso", "p_shareData_"+shareidtwo, shareData, 30*60)
 	}
 	return shareidone, shareidtwo
 }

+ 1 - 1
src/web/staticres/js/login.js

@@ -63,7 +63,7 @@ var JYLogin = function(shareid,kopshareid,num){
 	loginfg = setInterval(function(){
 		jylgi++;
 		//console.log(jylgi+"-----")
-		if(jylgi>600){
+		if(jylgi>720){
 			getNewShareId(mynum);
 			jylgi = 0;
 		}