Merge pull request #22 from zxhchime/master

fix:merge冲突解决
ClubWeGo · Feb 20, 2023 · b2cc41d · b2cc41d
2 parents 8563607 + 7cc183d
commit b2cc41d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/biz/handler/relation/follower_list_service.go b/biz/handler/relation/follower_list_service.go
diff --git a/kitex_server/userservice.go b/kitex_server/userservice.go
@@ -3,9 +3,9 @@ package kitex_server
 import (
 	"context"
 	"errors"
+	"github.com/prometheus/common/log"
 	"strconv"
 	"sync"
-
 	"github.com/ClubWeGo/douyin/biz/model/core"
 	"github.com/ClubWeGo/usermicro/kitex_gen/usermicro"
 	"github.com/ClubWeGo/videomicro/kitex_gen/videomicro"
@@ -142,6 +142,7 @@ func RegisterUser(username, password string) (userid int64, err error) {
 		Password: password, // 此处传输明文，加密由user微服务进行
 	})
 	if err != nil {
+		log.Errorf("注册error：%s", err)
 		return 0, err
 	}