fix bug

george518 · Sep 13, 2018 · b248de0 · b248de0
1 parent edbf7df
commit b248de0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/controllers/auth.go b/controllers/auth.go
@@ -15,6 +15,8 @@ import (
 
 	"github.com/george518/PPGo_ApiAdmin/utils"
 
+	"strconv"
+
 	"github.com/george518/PPGo_ApiAdmin/models"
 	cache "github.com/patrickmn/go-cache"
 )
@@ -104,7 +106,7 @@ func (self *AuthController) AjaxSave() {
 			self.ajaxMsg(err.Error(), MSG_ERR)
 		}
 	}
-	utils.Che.Set("menu"+utils.Int2String(self.user.Id), nil, cache.DefaultExpiration)
+	utils.Che.Set("menu"+strconv.Itoa(self.user.Id), nil, cache.DefaultExpiration)
 	self.ajaxMsg("", MSG_OK)
 }
 
@@ -117,6 +119,6 @@ func (self *AuthController) AjaxDel() {
 	if err := auth.Update(); err != nil {
 		self.ajaxMsg(err.Error(), MSG_ERR)
 	}
-	utils.Che.Set("menu"+utils.Int2String(self.user.Id), nil, cache.DefaultExpiration)
+	utils.Che.Set("menu"+strconv.Itoa(self.user.Id), nil, cache.DefaultExpiration)
 	self.ajaxMsg("", MSG_OK)
 }
diff --git a/controllers/common.go b/controllers/common.go
@@ -11,7 +11,9 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"yin/apiadmin/utils"
+
+	"github.com/george518/PPGo_ApiAdmin/libs"
+	"github.com/george518/PPGo_ApiAdmin/utils"
 
 	"github.com/astaxie/beego"
 	"github.com/george518/PPGo_ApiAdmin/models"
@@ -66,15 +68,16 @@ func (self *BaseController) auth() {
 		userId, _ := strconv.Atoi(idstr)
 		if userId > 0 {
 			var err error
-			cheUser, found := utils.Che.Get("uid" + utils.Int2String(userId))
+
+			cheUser, found := utils.Che.Get("uid" + strconv.Itoa(userId))
 			user := &models.Admin{}
 			if found && cheUser != nil { //从缓存取用户
 				user = cheUser.(*models.Admin)
 			} else {
 				user, err = models.AdminGetById(userId)
-				utils.Che.Set("uid"+utils.Int2String(user.Id), user, cache.DefaultExpiration)
+				utils.Che.Set("uid"+strconv.Itoa(userId), user, cache.DefaultExpiration)
 			}
-			if err == nil && password == utils.Md5([]byte(self.getClientIp()+"|"+user.Password+user.Salt)) {
+			if err == nil && password == libs.Md5([]byte(self.getClientIp()+"|"+user.Password+user.Salt)) {
 				self.userId = user.Id
 
 				self.loginName = user.LoginName
@@ -101,7 +104,7 @@ func (self *BaseController) auth() {
 }
 
 func (self *BaseController) AdminAuth() {
-	cheMen, found := utils.Che.Get("menu" + utils.Int2String(self.user.Id))
+	cheMen, found := utils.Che.Get("menu" + strconv.Itoa(self.user.Id))
 	if found && cheMen != nil { //从缓存取菜单
 		menu := cheMen.(*CheMenu)
 		//fmt.Println("调用显示菜单")
@@ -157,7 +160,7 @@ func (self *BaseController) AdminAuth() {
 		cheM.AllowUrl = self.allowUrl
 		cheM.List1 = self.Data["SideMenu1"].([]map[string]interface{})
 		cheM.List2 = self.Data["SideMenu2"].([]map[string]interface{})
-		utils.Che.Set("menu"+utils.Int2String(self.user.Id), cheM, cache.DefaultExpiration)
+		utils.Che.Set("menu"+strconv.Itoa(self.user.Id), cheM, cache.DefaultExpiration)
 	}
 
 }

diff --git a/controllers/login.go b/controllers/login.go
@@ -16,8 +16,8 @@ import (
 	"github.com/astaxie/beego"
 	"github.com/george518/PPGo_ApiAdmin/libs"
 	"github.com/george518/PPGo_ApiAdmin/models"
+	"github.com/george518/PPGo_ApiAdmin/utils"
 	cache "github.com/patrickmn/go-cache"
-	"gitub.com/george518/PPGo_ApiAdmin/utils"
 )
 
 type LoginController struct {
@@ -48,7 +48,7 @@ func (self *LoginController) LoginIn() {
 				user.LastIp = self.getClientIp()
 				user.LastLogin = time.Now().Unix()
 				user.Update()
-				utils.Che.Set("uid"+utils.Int2String(user.Id), user, cache.DefaultExpiration)
+				utils.Che.Set("uid"+strconv.Itoa(user.Id), user, cache.DefaultExpiration)
 				authkey := libs.Md5([]byte(self.getClientIp() + "|" + user.Password + user.Salt))
 				self.Ctx.SetCookie("auth", strconv.Itoa(user.Id)+"|"+authkey, 7*86400)
 

diff --git a/controllers/user.go b/controllers/user.go
@@ -10,7 +10,10 @@ package controllers
 import (
 	"strings"
 	"time"
-	"yin/apiadmin/utils"
+
+	"github.com/george518/PPGo_ApiAdmin/utils"
+
+	"strconv"
 
 	"github.com/george518/PPGo_ApiAdmin/libs"
 	"github.com/george518/PPGo_ApiAdmin/models"
@@ -32,7 +35,7 @@ func (self *UserController) Edit() {
 	row["phone"] = Admin.Phone
 	row["email"] = Admin.Email
 	self.Data["admin"] = row
-	utils.Che.Set("uid"+utils.Int2String(self.user.Id), nil, cache.DefaultExpiration)
+	utils.Che.Set("uid"+strconv.Itoa(self.user.Id), nil, cache.DefaultExpiration)
 	self.display()
 }
 

diff --git a/views/login/login.html b/views/login/login.html
@@ -9,6 +9,14 @@
         <link rel="stylesheet" href="/static/layui/css/layui.css?t=1504439386550" media="all">
         <link rel="stylesheet" href="/static/css/login.css?t=1504439386550" media="all">
     </head>
+
+    <!--登录超时，跳出框架显示登录页		start-->
+    <script>
+        if(self.location !== top.location){
+            top.location = self.location;
+        }
+    </script>
+    <!--登录超时，跳出框架显示登录页		end-->
     <body>
         <div class="layui-carousel video_mask bg-img" id="login_carousel" >