修改了微信授权登录

api/service/User.go

@@ -18,8 +18,8 @@ import (
 type UserService struct {
 }
 
-// HandleUserAvatar 处理用户头像
-func (r *UserService) HandleUserAvatar(wxAvatar string) (avatar string, err error) {
+// HandleUserImage 处理用户图片
+func (r *UserService) HandleUserImage(wxAvatar string) (ossPath string, err error) {
 	if wxAvatar == "" {
 		return "", nil
 	}
@@ -48,7 +48,7 @@ func (r *UserService) HandleUserAvatar(wxAvatar string) (avatar string, err erro
 	now := time.Now()
 	dateTimeString := now.Format("20060102150405")  // 当前时间字符串
 	rand.New(rand.NewSource(time.Now().UnixNano())) // 设置随机数
-	ossPath := "user/avatar/" + dateTimeString + fmt.Sprintf("%d", rand.Intn(9000)+1000) + ".png"
+	ossPath = "user/avatar/" + dateTimeString + fmt.Sprintf("%d", rand.Intn(9000)+1000) + ".png"
 
 	// 上传oss
 	_, err = aliyun.PutObjectByte(ossPath, respBody)
@@ -375,6 +375,25 @@ func (r *UserService) HandleAppUserInfo(tx *gorm.DB, user *model.User, userInfo
 		}
 	}
 
+	// 头像
+	if appUserInfo.Data.Photo != "" && user.Avatar == "" {
+		// 处理app图片前缀
+		photo, err := app.HandleImagePrefix(appUserInfo.Data.Photo)
+		if err != nil {
+			return err
+		}
+
+		if photo != "" {
+			// 处理用户图片，上传至oss
+			ossPath, err := r.HandleUserImage(appUserInfo.Data.Photo)
+			if err != nil {
+				return err
+			}
+
+			userData["avatar"] = ossPath
+		}
+	}
+
 	// 修改用户数据
 	if len(userData) > 0 {
 		userDao := dao.UserDao{}