feat: 机器列表新增运行状态 & refactor: 登录账号信息存储与context

server/internal/auth/api/account_login.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"mayfly-go/internal/auth/api/form"
@@ -107,7 +108,7 @@ func (a *AccountLogin) OtpVerify(rc *req.Ctx) {
 		update := &sysentity.Account{OtpSecret: otpSecret}
 		update.Id = accountId
 		update.OtpSecretEncrypt()
-		biz.ErrIsNil(a.AccountApp.Update(update))
+		biz.ErrIsNil(a.AccountApp.Update(context.Background(), update))
 	}
 
 	la := &sysentity.Account{Username: otpInfo.Username}
@@ -119,6 +120,7 @@ func (a *AccountLogin) OtpVerify(rc *req.Ctx) {
 }
 
 func (a *AccountLogin) Logout(rc *req.Ctx) {
-	req.GetPermissionCodeRegistery().Remove(rc.LoginAccount.Id)
-	ws.CloseClient(ws.UserId(rc.LoginAccount.Id))
+	la := rc.GetLoginAccount()
+	req.GetPermissionCodeRegistery().Remove(la.Id)
+	ws.CloseClient(ws.UserId(la.Id))
 }

server/internal/auth/api/common.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"fmt"
 	"mayfly-go/internal/auth/config"
 	msgapp "mayfly-go/internal/msg/application"
@@ -108,7 +109,7 @@ func saveLogin(account *sysentity.Account, ip string) {
 	updateAccount.Id = account.Id
 	updateAccount.LastLoginIp = ip
 	// 偷懒为了方便直接获取accountApp
-	biz.ErrIsNil(sysapp.GetAccountApp().Update(updateAccount))
+	biz.ErrIsNil(sysapp.GetAccountApp().Update(context.TODO(), updateAccount))
 
 	// 创建登录消息
 	loginMsg := &msgentity.Msg{
@@ -119,5 +120,5 @@ func saveLogin(account *sysentity.Account, ip string) {
 	loginMsg.CreateTime = &now
 	loginMsg.Creator = account.Username
 	loginMsg.CreatorId = account.Id
-	msgapp.GetMsgApp().Create(loginMsg)
+	msgapp.GetMsgApp().Create(context.TODO(), loginMsg)
 }

server/internal/auth/api/ldap_login.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
 	"mayfly-go/internal/auth/api/form"
@@ -88,10 +89,10 @@ func (a *LdapLogin) createUser(userName, displayName string) {
 	account := &sysentity.Account{Username: userName}
 	account.SetBaseInfo(nil)
 	account.Name = displayName
-	biz.ErrIsNil(a.AccountApp.Create(account))
+	biz.ErrIsNil(a.AccountApp.Create(context.TODO(), account))
 	// 将 LADP 用户本地密码设置为空，不允许本地登录
 	account.Password = cryptox.PwdHash("")
-	biz.ErrIsNil(a.AccountApp.Update(account))
+	biz.ErrIsNil(a.AccountApp.Update(context.TODO(), account))
 }
 
 func (a *LdapLogin) getOrCreateUserWithLdap(userName string, password string, cols ...string) (*sysentity.Account, error) {

server/internal/auth/api/oauth2_login.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"mayfly-go/internal/auth/api/vo"
@@ -42,7 +43,7 @@ func (a *Oauth2Login) OAuth2Login(rc *req.Ctx) {
 func (a *Oauth2Login) OAuth2Bind(rc *req.Ctx) {
 	client, _ := a.getOAuthClient()
 	state := stringx.Rand(32)
-	cache.SetStr("oauth2:state:"+state, "bind:"+strconv.FormatUint(rc.LoginAccount.Id, 10),
+	cache.SetStr("oauth2:state:"+state, "bind:"+strconv.FormatUint(rc.GetLoginAccount().Id, 10),
 		5*time.Minute)
 	rc.GinCtx.Redirect(http.StatusFound, client.AuthCodeURL(state))
 }
@@ -152,7 +153,7 @@ func (a *Oauth2Login) doLoginAction(rc *req.Ctx, userId string, oauth *config.Oa
 			Name:     userId,
 			Username: userId,
 		}
-		biz.ErrIsNil(a.AccountApp.Create(account))
+		biz.ErrIsNil(a.AccountApp.Create(context.TODO(), account))
 		// 绑定
 		err := a.Oauth2App.BindOAuthAccount(&entity.Oauth2Account{
 			AccountId:  account.Id,
@@ -207,7 +208,7 @@ func (a *Oauth2Login) Oauth2Status(ctx *req.Ctx) {
 	res.Enable = oauth2LoginConfig.Enable
 	if res.Enable {
 		err := a.Oauth2App.GetOAuthAccount(&entity.Oauth2Account{
-			AccountId: ctx.LoginAccount.Id,
+			AccountId: ctx.GetLoginAccount().Id,
 		}, "account_id", "identity")
 		res.Bind = err == nil
 	}
@@ -216,7 +217,7 @@ func (a *Oauth2Login) Oauth2Status(ctx *req.Ctx) {
 }
 
 func (a *Oauth2Login) Oauth2Unbind(rc *req.Ctx) {
-	a.Oauth2App.Unbind(rc.LoginAccount.Id)
+	a.Oauth2App.Unbind(rc.GetLoginAccount().Id)
 }
 
 // 获取oauth2登录配置信息，因为有些字段是敏感字段，故单独使用接口获取

server/internal/auth/application/oauth2.go

@@ -1,6 +1,7 @@
 package application
 
 import (
+	"context"
 	"mayfly-go/internal/auth/domain/entity"
 	"mayfly-go/internal/auth/domain/repository"
 )
@@ -29,11 +30,11 @@ func (a *oauth2AppImpl) GetOAuthAccount(condition *entity.Oauth2Account, cols ..
 
 func (a *oauth2AppImpl) BindOAuthAccount(e *entity.Oauth2Account) error {
 	if e.Id == 0 {
-		return a.oauthAccountRepo.Insert(e)
+		return a.oauthAccountRepo.Insert(context.Background(), e)
 	}
-	return a.oauthAccountRepo.UpdateById(e)
+	return a.oauthAccountRepo.UpdateById(context.Background(), e)
 }
 
 func (a *oauth2AppImpl) Unbind(accountId uint64) {
-	a.oauthAccountRepo.DeleteByCond(&entity.Oauth2Account{AccountId: accountId})
+	a.oauthAccountRepo.DeleteByCond(context.Background(), &entity.Oauth2Account{AccountId: accountId})
 }