Merge branch 'dev' of github.com:answerdev/answer into dev

internal/service/content/user_service.go

@@ -527,6 +527,7 @@ func (us *UserService) UserVerifyEmail(ctx context.Context, req *schema.UserVeri
 	}
 	if err = us.userActivity.UserActive(ctx, userInfo.ID); err != nil {
 		log.Error(err)
+		return nil, err
 	}
 
 	// In the case of three-party login, the associated users are bound
@@ -660,6 +661,7 @@ func (us *UserService) UserChangeEmailVerify(ctx context.Context, content string
 	if userInfo.MailStatus == entity.EmailStatusToBeVerified {
 		if err = us.userActivity.UserActive(ctx, userInfo.ID); err != nil {
 			log.Error(err)
+			return nil, err
 		}
 	}
 

internal/service/user_external_login/user_center_login_service.go

@@ -129,7 +129,9 @@ func (us *UserCenterLoginService) ExternalLogin(
 		return nil, err
 	}
 
-	us.activeUser(ctx, oldUserInfo)
+	if err := us.activeUser(ctx, oldUserInfo); err != nil {
+		return nil, err
+	}
 
 	accessToken, _, err := us.userCommonService.CacheLoginUserInfo(
 		ctx, oldUserInfo.ID, oldUserInfo.MailStatus, oldUserInfo.Status, oldExternalLoginUserInfo.ExternalID)
@@ -181,10 +183,12 @@ func (us *UserCenterLoginService) registerNewUser(ctx context.Context, provider
 	return userInfo, nil
 }
 
-func (us *UserCenterLoginService) activeUser(ctx context.Context, oldUserInfo *entity.User) {
+func (us *UserCenterLoginService) activeUser(ctx context.Context, oldUserInfo *entity.User) error {
 	if err := us.userActivity.UserActive(ctx, oldUserInfo.ID); err != nil {
 		log.Error(err)
+		return err
 	}
+	return nil
 }
 
 func (us *UserCenterLoginService) UserCenterUserSettings(ctx context.Context, userID string) (