u

code/allapp/allapp-go-v3/internal/handle/auth.go

@@ -6,18 +6,24 @@ import (
 	"allapp-go/internal/types"
 	"allapp-go/pkg/db"
 	"allapp-go/pkg/jwtx"
+	"allapp-go/pkg/requestx"
+	"allapp-go/pkg/s3store"
 	"allapp-go/pkg/uniqueid"
 	"allapp-go/pkg/wechat"
 	"fmt"
+	"net/url"
+	"path/filepath"
+	"time"
 
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/log"
+	"github.com/google/uuid"
 )
 
 // LoginQq ======================== QQ 登录 ========================
 func LoginQq(c fiber.Ctx) error {
-	var req types.LoginQqDTO
-	vo := new(types.LoginVO)
+	var req types.LoginQqReq
+	vo := new(types.LoginResp)
 
 	if err := httpx.BindAndValidate(c, &req); err != nil {
 		return errors.WithStack(err)
@@ -28,8 +34,8 @@ func LoginQq(c fiber.Ctx) error {
 
 // LoginWechat ======================== 微信登录 ========================
 func LoginWechat(c fiber.Ctx) error {
-	var req types.LoginWechatDTO
-	vo := new(types.LoginVO)
+	var req types.LoginWechatReq
+	vo := new(types.LoginResp)
 
 	if err := httpx.BindAndValidate(c, &req); err != nil {
 		return errors.WithStack(err)
@@ -37,13 +43,13 @@ func LoginWechat(c fiber.Ctx) error {
 
 	openid, token, err := wechat.GetWechatAccess(req.Code)
 	if err != nil {
-		log.Errorw("wechat access failed", "code", req.Code, "error", err)
+		log.Errorw("微信获取Token失败", "code", req.Code, "error", err)
 		return httpx.Fail(c, "微信登录失败，请重试")
 	}
 
 	nickname, avatar, err := wechat.GetWechatUserInfo(token, openid)
 	if err != nil {
-		log.Errorw("wechat userinfo failed", "openid", openid, "error", err)
+		log.Errorw("微信获取用户信息系失败", "openid", openid, "error", err)
 		return httpx.Fail(c, "微信登录失败，请重试")
 	}
 
@@ -57,7 +63,7 @@ func handleThirdLogin(
 	nickname string,
 	avatar string,
 	loginType int16,
-	vo *types.LoginVO,
+	vo *types.LoginResp,
 ) error {
 	dbClient := db.New()
 
@@ -133,15 +139,58 @@ func registerUser(
 	c fiber.Ctx,
 	openid, nickname, avatar string,
 	loginType int16,
-	vo *types.LoginVO,
+	vo *types.LoginResp,
 ) error {
 	userId := uniqueid.NextId()
 
+	defaultAvatar := "https://default-avatar-url.com/default.png"
+
 	if nickname == "" {
 		nickname = fmt.Sprintf("用户_%d", userId)
 	}
+
 	if avatar == "" {
-		avatar = "https://default-avatar-url.com/default.png"
+		avatar = defaultAvatar
+	} else {
+		// 下载头像（流式）
+		stream, size, contentType, err := requestx.GetFileStream(c.Context(), avatar)
+		if err != nil {
+			avatar = defaultAvatar
+		} else {
+			defer func() {
+				_ = stream.Close()
+			}()
+
+			// ✅ 从 avatar URL 获取扩展名（简化版）
+			u, _ := url.Parse(avatar)
+			ext := filepath.Ext(u.Path)
+			if ext == "" {
+				ext = ".jpg" // 兜底
+			}
+
+			// 年月日 + uuid
+			now := time.Now()
+			key := fmt.Sprintf("%d/%02d/%02d/%s%s",
+				now.Year(),
+				now.Month(),
+				now.Day(),
+				uuid.NewString(),
+				ext,
+			)
+
+			// 上传到 S3
+			if err := s3store.UploadToRustFS(
+				c.Context(),
+				stream,
+				key,
+				size,
+				contentType,
+			); err != nil {
+				avatar = defaultAvatar
+			} else {
+				avatar = key
+			}
+		}
 	}
 
 	err := dbClient.WithTx(c.Context(), func(tx *db.Client) error {

code/allapp/allapp-go-v3/internal/handle/s3.go

@@ -3,32 +3,18 @@ package handle
 import (
 	"allapp-go/internal/errors"
 	"allapp-go/internal/httpx"
+	"allapp-go/internal/types"
+	"allapp-go/pkg/logger"
 	"allapp-go/pkg/s3store"
 	"fmt"
 	"path/filepath"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/gofiber/fiber/v3"
 	"github.com/google/uuid"
+	"go.uber.org/zap"
 )
 
-func S3ListBuckets(c fiber.Ctx) error {
-	result, err := s3store.S3Client.ListBuckets(c.Context(), &s3.ListBucketsInput{})
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	buckets := make([]string, 0, len(result.Buckets))
-	for _, b := range result.Buckets {
-		if b.Name != nil {
-			buckets = append(buckets, *b.Name)
-		}
-	}
-
-	return httpx.OK(c, buckets)
-}
-
 func S3UploadFile(c fiber.Ctx) error {
 	form, err := c.MultipartForm()
 	if err != nil {
@@ -64,8 +50,8 @@ func S3UploadFile(c fiber.Ctx) error {
 
 		err = s3store.UploadToRustFS(
 			c.Context(),
-			key,
 			file,
+			key,
 			fileHeader.Size,
 			contentType,
 		)
@@ -81,3 +67,23 @@ func S3UploadFile(c fiber.Ctx) error {
 
 	return httpx.OK(c, result)
 }
+
+func S3DeleteFile(c fiber.Ctx) error {
+	var req types.S3DeleteReq
+
+	if err := httpx.BindAndValidate(c, &req); err != nil {
+		return errors.WithStack(err)
+	}
+
+	log := logger.FromCtx(c.Context())
+
+	if err := s3store.DeleteBatch(c.Context(), req.Keys); err != nil {
+		log.Warn("S3 批量删除失败",
+			zap.Int("count", len(req.Keys)),
+			zap.Error(err),
+		)
+		// ❗仍然返回成功（符合你的要求）
+	}
+
+	return httpx.OK(c, nil)
+}