style: 代码格式化

utils/auth/auth.go

@@ -2,11 +2,12 @@ package auth
 
 import (
 	"errors"
+	"strconv"
+	"time"
+
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
-	"strconv"
-	"time"
 )
 
 type IAuth interface {
@@ -31,7 +32,6 @@ func RegisterAuth(t string, a IAuth) {
 	if t == "" || a == nil {
 		return
 	}
-
 	var ok bool
 	if _, ok = iauthMap[t]; ok {
 		return
@@ -71,11 +71,9 @@ func AddToGlobalTokenStore(c *entitys.CtrlContext, userInfo *sysmodel.SysUser) (
 		token.LoginID = userInfo.LoginId
 		token.UserId = userInfo.Id
 		token.Result = 200
-		//token.Password = pwd
 		token.ServerIp = ""
 		token.Domain = userInfo.Domain
 		sysutils.GetGlobalTokenStore().Set(sec_tooken, token)
-		//sysutils.GetGlobalTokenStore().Set(token.LoginID+user.Domain, token)
 	} else {
 		token = v
 	}
@@ -86,7 +84,6 @@ func AddToGlobalTokenStore(c *entitys.CtrlContext, userInfo *sysmodel.SysUser) (
 	if err != nil {
 		return nil, errors.New("business db con't found user!")
 	}
-
 	data := sysmodel.LoginReturnInfo{}
 	data.Id = userInfo.Id
 	data.LoginId = userInfo.LoginId
@@ -102,6 +99,5 @@ func AddToGlobalTokenStore(c *entitys.CtrlContext, userInfo *sysmodel.SysUser) (
 	var roles []sysmodel.SysRole
 	c.App.GetBusinessDb(userInfo.Domain).SQL("select sys_role.* from sys_user_role, sys_role where sys_user_role.role_id = sys_role.id and sys_role.del_flag = 0 and sys_user_role.user_id = ? order by sys_role.priority asc", userInfo.Id).Find(&roles)
 	data.Roles = roles
-
 	return &data, nil
 }

utils/token_store.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"errors"
-	"log"
 	"strings"
 	"sync"
 	"time"
@@ -45,7 +44,6 @@ func (t *MemoryStore) Get(key string) *entitys.Token {
 	t.lock.RLock()
 	defer t.lock.RUnlock()
 	if val, ok := t.tokens[key]; ok {
-		//log.Println(key, "获取Token:", val.AccessToken, val.RefreshToken, val.LoginID)
 		return val
 	}
 	return nil
@@ -59,14 +57,12 @@ func (t *MemoryStore) Set(key string, v *entitys.Token) {
 	} else if val != v {
 		t.tokens[key] = v
 	}
-	log.Println(key, "添加Token:", v.AccessToken, v.RefreshToken, v.LoginID)
 }
 
 func (t *MemoryStore) Remove(key string) {
 	t.lock.Lock()
 	defer t.lock.Unlock()
 	delete(t.tokens, key)
-	log.Println(key, "删除Key")
 }
 
 func (t *MemoryStore) Refresh(key string) {
@@ -90,12 +86,10 @@ func (t *MemoryStore) startTokenCheckProcess() {
 		select {
 		case <-t1.C:
 			t.lock.Lock()
-
 			keys := []string{}
 			for k, v := range t.tokens {
 				timestampt := time.Unix(int64(v.TimeStamp), 0)
 				subval := time.Now().Sub(timestampt)
-
 				if subval.Seconds() < 0 || subval.Seconds() > 3600 {
 					keys = append(keys, k)
 				}
@@ -103,7 +97,6 @@ func (t *MemoryStore) startTokenCheckProcess() {
 			for _, k := range keys {
 				delete(t.tokens, k)
 			}
-
 			t.lock.Unlock()
 		}
 	}
@@ -113,7 +106,6 @@ func Validate(accessToken, loginId string, domain string) (*entitys.Token, error
 	token := globalTokenStore.Get(loginId + domain)
 	if token != nil {
 		if strings.EqualFold(token.AccessToken, accessToken) {
-			logs.Info("get the token ", accessToken, " of id ", loginId+domain)
 			globalTokenStore.Refresh(loginId + domain)
 			return token, nil
 		} else {
@@ -124,19 +116,15 @@ func Validate(accessToken, loginId string, domain string) (*entitys.Token, error
 		logs.Error("can not get the token of", loginId+domain)
 		return token, errors.New("can not get the token of " + loginId + domain)
 	}
-
 }
 
 func TokenValidate(token string) (*entitys.Token, error) {
-	user := globalTokenStore.Get(token)
-
-	if strings.EqualFold(user.AccessToken, token) {
-		logs.Info("get the token ", token, " of id ")
+	tokenRaw := globalTokenStore.Get(token)
+	if strings.EqualFold(tokenRaw.AccessToken, token) {
 		globalTokenStore.Refresh(token)
-		return user, nil
+		return tokenRaw, nil
 	} else {
-		logs.Error(user.AccessToken, "is not equal to", token)
-		return user, errors.New(user.AccessToken + " is not equal to " + token)
+		logs.Error(tokenRaw.AccessToken, "is not equal to", token)
+		return tokenRaw, errors.New(tokenRaw.AccessToken + " is not equal to " + token)
 	}
-
 }