add conn log

service/audit.go

@@ -0,0 +1,52 @@
+package service
+
+import (
+	"Gwen/global"
+	"Gwen/model"
+	"gorm.io/gorm"
+)
+
+type AuditService struct {
+}
+
+func (as *AuditService) AuditConnList(page, pageSize uint, where func(tx *gorm.DB)) (res *model.AuditConnList) {
+	res = &model.AuditConnList{}
+	res.Page = int64(page)
+	res.PageSize = int64(pageSize)
+	tx := global.DB.Model(&model.AuditConn{})
+	if where != nil {
+		where(tx)
+	}
+	tx.Count(&res.Total)
+	tx.Scopes(Paginate(page, pageSize))
+	tx.Find(&res.AuditConns)
+	return
+}
+
+// Create 创建
+func (as *AuditService) CreateAuditConn(u *model.AuditConn) error {
+	res := global.DB.Create(u).Error
+	return res
+}
+func (as *AuditService) DeleteAuditConn(u *model.AuditConn) error {
+	return global.DB.Delete(u).Error
+}
+
+// Update 更新
+func (as *AuditService) UpdateAuditConn(u *model.AuditConn) error {
+	return global.DB.Model(u).Updates(u).Error
+}
+
+// InfoByPeerIdAndConnId
+func (as *AuditService) InfoByPeerIdAndConnId(peerId string, connId int64) (res *model.AuditConn) {
+	res = &model.AuditConn{}
+	global.DB.Where("peer_id = ? and conn_id = ?", peerId, connId).First(res)
+	return
+}
+
+// InfoById
+func (as *AuditService) InfoById(id uint) (res *model.AuditConn) {
+	res = &model.AuditConn{}
+	global.DB.Where("id = ?", id).First(res)
+	return
+}

service/oauth.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
 	"golang.org/x/oauth2/google"
@@ -174,7 +173,7 @@ func (os *OauthService) GithubCallback(code string) (error error, userData *Gith
 	}
 	token, err := oauthConfig.Exchange(context.Background(), code)
 	if err != nil {
-		global.Logger.Warn(fmt.Printf("oauthConfig.Exchange() failed: %s\n", err))
+		global.Logger.Warn("oauthConfig.Exchange() failed: ", err)
 		error = errors.New("GetOauthTokenError")
 		return
 	}
@@ -183,20 +182,20 @@ func (os *OauthService) GithubCallback(code string) (error error, userData *Gith
 	client := oauthConfig.Client(context.Background(), token)
 	resp, err := client.Get("https://api.github.com/user")
 	if err != nil {
-		global.Logger.Warn("failed getting user info: %s\n", err)
+		global.Logger.Warn("failed getting user info: ", err)
 		error = errors.New("GetOauthUserInfoError")
 		return
 	}
 	defer func(Body io.ReadCloser) {
 		err := Body.Close()
 		if err != nil {
-			global.Logger.Warn("failed closing response body: %s\n", err)
+			global.Logger.Warn("failed closing response body: ", err)
 		}
 	}(resp.Body)
 
 	// 在这里处理 GitHub 用户信息
 	if err = json.NewDecoder(resp.Body).Decode(&userData); err != nil {
-		global.Logger.Warn("failed decoding user info: %s\n", err)
+		global.Logger.Warn("failed decoding user info: ", err)
 		error = errors.New("DecodeOauthUserInfoError")
 		return
 	}
@@ -207,7 +206,7 @@ func (os *OauthService) GoogleCallback(code string) (error error, userData *Goog
 	err, oauthConfig := os.GetOauthConfig(model.OauthTypeGoogle)
 	token, err := oauthConfig.Exchange(context.Background(), code)
 	if err != nil {
-		global.Logger.Warn(fmt.Printf("oauthConfig.Exchange() failed: %s\n", err))
+		global.Logger.Warn("oauthConfig.Exchange() failed: ", err)
 		error = errors.New("GetOauthTokenError")
 		return
 	}
@@ -215,14 +214,14 @@ func (os *OauthService) GoogleCallback(code string) (error error, userData *Goog
 	client := oauthConfig.Client(context.Background(), token)
 	resp, err := client.Get("https://www.googleapis.com/oauth2/v2/userinfo")
 	if err != nil {
-		global.Logger.Warn("failed getting user info: %s\n", err)
+		global.Logger.Warn("failed getting user info: ", err)
 		error = errors.New("GetOauthUserInfoError")
 		return
 	}
 	defer func(Body io.ReadCloser) {
 		err := Body.Close()
 		if err != nil {
-			global.Logger.Warn("failed closing response body: %s\n", err)
+			global.Logger.Warn("failed closing response body: ", err)
 		}
 	}(resp.Body)
 

service/service.go

@@ -15,6 +15,7 @@ type Service struct {
 	*GroupService
 	*OauthService
 	*LoginLogService
+	*AuditService
 }
 
 func New() *Service {

service/user.go

@@ -21,6 +21,11 @@ func (us *UserService) InfoById(id uint) *model.User {
 	global.DB.Where("id = ?", id).First(u)
 	return u
 }
+func (us *UserService) InfoByUsername(un string) *model.User {
+	u := &model.User{}
+	global.DB.Where("username = ?", un).First(u)
+	return u
+}
 
 // InfoByOpenid 根据openid取用户信息
 func (us *UserService) InfoByOpenid(openid string) *model.User {