瀏覽代碼

update:优先获取前端传递的token参数

zoie 2 月之前
父節點
當前提交
3b439ab81d

+ 2 - 2
controllers/Data.go

@@ -36,9 +36,9 @@ func (c *DataController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 	if Account.Admin_r == nil {
 		return

+ 2 - 2
controllers/DataSource.go

@@ -22,9 +22,9 @@ func (c *DataSourceController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 
 	c.Admin_r = *Account.Admin_r

+ 2 - 2
controllers/Device.go

@@ -28,9 +28,9 @@ func (c *DeviceController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 	if Account.Admin_r == nil {
 		return

+ 2 - 2
controllers/Logs.go

@@ -20,9 +20,9 @@ func (c *LogsController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 
 	c.Admin_r = *Account.Admin_r

+ 2 - 2
controllers/Product.go

@@ -22,9 +22,9 @@ func (c *ProductController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 
 	c.Admin_r = *Account.Admin_r

+ 2 - 2
controllers/RawSql.go

@@ -21,9 +21,9 @@ func (c *RawSqlController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 
 	c.Admin_r = *Account.Admin_r

+ 4 - 4
controllers/User.go

@@ -35,9 +35,9 @@ func (c *UserController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 	if Account.Admin_r == nil {
 		return
@@ -472,9 +472,9 @@ func (c *UserController) Company_Entry() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 
 	T_pid, _ := c.GetInt("T_pid")

+ 2 - 2
controllers/bulletin.go

@@ -21,9 +21,9 @@ type BulletinController struct {
 func (c *BulletinController) Prepare() {
 	GetCookie := c.Ctx.GetCookie("User_tokey")
 	GetString := c.GetString("User_tokey")
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 	if Account.Admin_r == nil {
 		return

+ 2 - 2
models/Account/Tokey.go

@@ -108,9 +108,9 @@ func Redis_Tokey_T_pid_Get(Tokey string) (int, bool) {
 func Verification(GetCookie string, GetString string) (bool, Admin) {
 	// 自适应 参数
 	//log.Println("登录验证Verification", GetCookie, GetString)
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
 	if len(User_tokey) == 0 {
 		return false, Admin{}

+ 3 - 3
routers/filter.go

@@ -98,11 +98,11 @@ func T_pidFilter(ctx *context.Context) {
 	GetCookie := ctx.GetCookie("User_tokey")
 	GetString := ctx.Input.Query("User_tokey")
 
-	User_tokey := GetCookie
+	User_tokey := GetString
 	if len(User_tokey) == 0 {
-		User_tokey = GetString
+		User_tokey = GetCookie
 	}
-	b_, admin_r := Account.Verification(ctx.GetCookie("User_tokey"), ctx.Input.Query("User_tokey"))
+	b_, admin_r := Account.Verification(GetCookie, GetString)
 	if !b_ {
 		ctx.Output.JSON(lib.JSONS{Code: 201, Msg: "请重新登陆!"}, true, false)
 		return