From cc47a7f3e984358ccec25d7a1fd45f3741ea5234 Mon Sep 17 00:00:00 2001
From: landaiqing <landaiqing@126.com>
Date: Fri, 23 May 2025 22:08:06 +0800
Subject: [PATCH] :art: update

---
 app/auth/api/auth.api                                  |  2 +-
 app/auth/api/etc/auth.yaml                             |  4 ++--
 .../internal/logic/auth/modify_personal_info_logic.go  |  7 ++++++-
 app/auth/api/internal/logic/user/admin_login_logic.go  | 10 ++++++++--
 app/auth/api/internal/types/types.go                   |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/auth/api/auth.api b/app/auth/api/auth.api
index 655f259..364fd1c 100644
--- a/app/auth/api/auth.api
+++ b/app/auth/api/auth.api
@@ -1101,7 +1101,7 @@ type (
 		Nickname  string `json:"nickname,optional"`
 		Avatar    string `json:"avatar,optional"`
 		Email     string `json:"email,optional"`
-		Gender    int64  `json:"gender,optional"`
+		Gender    string `json:"gender,optional"`
 		Introduce string `json:"introduce,optional"`
 		Blog      string `json:"blog,optional"`
 		Location  string `json:"location,optional"`
diff --git a/app/auth/api/etc/auth.yaml b/app/auth/api/etc/auth.yaml
index 8b8d98e..d58c0a2 100644
--- a/app/auth/api/etc/auth.yaml
+++ b/app/auth/api/etc/auth.yaml
@@ -165,9 +165,9 @@ Minio:
   # Minio 地址
   Endpoint: 115.190.97.132:9000
   # Minio 访问密钥
-  AccessKeyID: RsIT1NvhINLgPt9ElBda
+  AccessKeyID: tHIVeEW2BpRxoRnl2E4C
   # Minio 访问密钥
-  SecretAccessKey: 5ZXGFpuFsKgPXQ9DPAyAB7mzsvlbCZpBheNbmc89
+  SecretAccessKey: Et7TM5EPlGYNOrSabAN8i2cLSqn6QjhRllLLaYTx
   # Minio 使用SSL
   UseSSL: false
 #NSQ配置
diff --git a/app/auth/api/internal/logic/auth/modify_personal_info_logic.go b/app/auth/api/internal/logic/auth/modify_personal_info_logic.go
index 4e69ae9..fe1543c 100644
--- a/app/auth/api/internal/logic/auth/modify_personal_info_logic.go
+++ b/app/auth/api/internal/logic/auth/modify_personal_info_logic.go
@@ -6,6 +6,7 @@ import (
 	"schisandra-album-cloud-microservices/app/auth/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/auth/api/internal/types"
 	"schisandra-album-cloud-microservices/app/auth/model/mysql/model"
+	"strconv"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -31,7 +32,11 @@ func (l *ModifyPersonalInfoLogic) ModifyPersonalInfo(req *types.ModifyPersonalIn
 	}
 
 	authUser := l.svcCtx.DB.ScaAuthUser
-	info, err := authUser.Where(authUser.UID.Eq(uid)).Updates(model.ScaAuthUser{Nickname: req.Nickname, Avatar: req.Avatar, Email: req.Email, Gender: req.Gender, Introduce: req.Introduce, Blog: req.Blog, Location: req.Location, Company: req.Company})
+	gender, err := strconv.ParseInt(req.Gender, 10, 64)
+	if err != nil {
+		return "", errors.New("gender is not valid")
+	}
+	info, err := authUser.Where(authUser.UID.Eq(uid)).Updates(model.ScaAuthUser{Nickname: req.Nickname, Avatar: req.Avatar, Email: req.Email, Gender: gender, Introduce: req.Introduce, Blog: req.Blog, Location: req.Location, Company: req.Company})
 	if err != nil {
 		return "", err
 	}
diff --git a/app/auth/api/internal/logic/user/admin_login_logic.go b/app/auth/api/internal/logic/user/admin_login_logic.go
index 5db9277..9b95be5 100644
--- a/app/auth/api/internal/logic/user/admin_login_logic.go
+++ b/app/auth/api/internal/logic/user/admin_login_logic.go
@@ -38,8 +38,7 @@ func (l *AdminLoginLogic) AdminLogin(r *http.Request, req *types.AdminLoginReque
 	authUser := l.svcCtx.DB.ScaAuthUser
 	permissionRule := l.svcCtx.DB.ScaAuthPermissionRule
 	adminUser, err := authUser.
-		LeftJoin(permissionRule, authUser.UID.EqCol(permissionRule.V0)).
-		Where(authUser.Username.Eq(req.Account), authUser.Password.Eq(req.Password), permissionRule.V1.Eq(constant.Admin)).
+		Where(authUser.Username.Eq(req.Account)).
 		Group(authUser.UID).First()
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err
@@ -50,6 +49,13 @@ func (l *AdminLoginLogic) AdminLogin(r *http.Request, req *types.AdminLoginReque
 	if !utils.Verify(adminUser.Password, req.Password) {
 		return nil, errors.New(http.StatusInternalServerError, i18n.FormatText(l.ctx, "login.invalidPassword"))
 	}
+	first, err := permissionRule.Where(permissionRule.Ptype.Eq("g"), permissionRule.V0.Eq(adminUser.UID), permissionRule.V1.Eq(constant.Admin)).First()
+	if err != nil && err != gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if first == nil {
+		return nil, errors.New(http.StatusInternalServerError, i18n.FormatText(l.ctx, "login.notPermission"))
+	}
 	data, err := HandleLoginJWT(adminUser, l.svcCtx, true, r, l.ctx)
 	if err != nil {
 		return nil, err
diff --git a/app/auth/api/internal/types/types.go b/app/auth/api/internal/types/types.go
index 6b655c5..8292079 100644
--- a/app/auth/api/internal/types/types.go
+++ b/app/auth/api/internal/types/types.go
@@ -384,7 +384,7 @@ type ModifyPersonalInfoRequest struct {
 	Nickname  string `json:"nickname,optional"`
 	Avatar    string `json:"avatar,optional"`
 	Email     string `json:"email,optional"`
-	Gender    int64  `json:"gender,optional"`
+	Gender    string `json:"gender,optional"`
 	Introduce string `json:"introduce,optional"`
 	Blog      string `json:"blog,optional"`
 	Location  string `json:"location,optional"`