Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/auth/internal/logic/useremailregisterlogic.go

@@ -76,10 +76,16 @@ func (l *UserEmailRegisterLogic) UserEmailRegister(req *types.RequestEmailRegist
 	if token.Platform == auth.PLATFORM_FUSEN {
 		tplsel = "email_register.tpl"
 	} else {
+
 		tplsel = "email_register_oauth2.tpl"
 	}
 
 	userName := token.Extend["first_name"].(string) + " " + token.Extend["last_name"].(string)
+	var platformAndId string
+	if oauthId, ok := token.Extend["oauth_id"]; ok {
+		platformAndId = token.Platform + " Id: " + oauthId.(string)
+	}
+
 	// 进入发送邮箱的系统
 	EmailManager.EmailTasks <- &EmailFormat{
 		TemplateName:     tplsel,
@@ -90,8 +96,9 @@ func (l *UserEmailRegisterLogic) UserEmailRegister(req *types.RequestEmailRegist
 		SenderName:       "support@fusenpack.com",
 		SenderTitle:      "register-valid",
 		Extend: map[string]string{
-			"UserName": userName,
-			"Email":    req.Email,
+			"UserName":      userName,
+			"Email":         req.Email,
+			"PlatformAndID": platformAndId,
 		},
 	} // email进入队
 

server/auth/internal/logic/usergoogleloginlogic.go

@@ -33,6 +33,7 @@ type UserGoogleLoginLogic struct {
 
 	isRegistered  bool   // 是否注册
 	registerToken string // 注册邮箱的token
+	defaultEmail  string // 能从第三方拿到的默认邮箱
 	registerInfo  *auth.RegisterToken
 }
 
@@ -75,7 +76,7 @@ func (l *UserGoogleLoginLogic) UserGoogleLogin(req *types.RequestGoogleLogin, us
 	gresult := r.Json()
 	logx.Info(gresult)
 
-	googleId := gresult.Get("id").Int()
+	googleId := gresult.Get("id").String()
 	user, err := l.svcCtx.AllModels.FsUser.FindUserByGoogleId(context.TODO(), googleId)
 	if err != nil {
 		if err != gorm.ErrRecordNotFound {
@@ -96,7 +97,7 @@ func (l *UserGoogleLoginLogic) UserGoogleLogin(req *types.RequestGoogleLogin, us
 			TraceId:     uuid.NewString(),
 			CreateAt:    time.Now().UTC(),
 			Extend: map[string]interface{}{
-				"google_id":  googleId,
+				"oauth_id":   googleId,
 				"first_name": gresult.Get("family_name").String(),
 				"last_name":  gresult.Get("given_name").String(),
 			},
@@ -109,6 +110,7 @@ func (l *UserGoogleLoginLogic) UserGoogleLogin(req *types.RequestGoogleLogin, us
 			return resp.SetStatus(basic.CodeOAuthRegisterTokenErr)
 		}
 		l.registerToken = token
+		l.defaultEmail = gresult.Get("email").String()
 
 		return resp.SetStatus(basic.CodeOK)
 	}
@@ -136,10 +138,11 @@ func (l *UserGoogleLoginLogic) AfterLogic(w http.ResponseWriter, r *http.Request
 		logx.Info(l)
 
 		rurl := fmt.Sprintf(
-			"http://www.fusen.3718.cn"+"/oauth?token=%s&is_registered=%t&register_token=%s",
+			"http://www.fusen.3718.cn"+"/oauth?token=%s&is_registered=%t&register_token=%s&defaultEmail=%s",
 			l.token,
 			l.isRegistered,
 			l.registerToken,
+			l.registerInfo.Email,
 		)
 
 		html := fmt.Sprintf(`

server/resource/internal/logic/logoresizelogic.go

@@ -11,7 +11,7 @@ import (
 	"fusenapi/utils/file"
 	"fusenapi/utils/hash"
 	"image"
-	"image/jpeg"
+	"image/png"
 	"io"
 	"net/http"
 
@@ -91,7 +91,7 @@ func (l *LogoResizeLogic) LogoResize(req *types.LogoResizeReq, userinfo *auth.Us
 	}
 
 	emptyBuff := bytes.NewBuffer(nil) //开辟一个新的空buff
-	jpeg.Encode(emptyBuff, src, nil)  //img写入到buff
+	png.Encode(emptyBuff, src)        //img写入到buff
 
 	var hashKeyDataMap = make(map[string]interface{})