修改冲突的变量名

app/auth/internal/logic/code2_session_logic.go

@@ -57,11 +57,11 @@ func (l *Code2SessionLogic) Code2Session(in *auth.Code2SessionRequest) (*auth.Co
 		}
 		auModel.UserID = &userId.UserId
 	} else {
-		user, err := l.svcCtx.UserManagerClient.FindById(l.ctx, &user.UserId{UserId: *auModel.UserID})
+		userModel, err := l.svcCtx.UserManagerClient.FindById(l.ctx, &user.UserId{UserId: *auModel.UserID})
 		if err != nil {
 			return nil, err
 		}
-		isNew = user.IsNew
+		isNew = userModel.IsNew
 	}
 
 	return &auth.Code2SessionResponse{

app/auth/pkg/douyin/douyin_openapi_test.go

@@ -4,7 +4,6 @@ import (
 	accessToken "gitea.youtukeji.com.cn/youtu/openapi-helper/douyin/access-token"
 	"github.com/silenceper/wechat/v2/cache"
 	"testing"
-	"time"
 )
 
 // 声明测试常量
@@ -61,30 +60,3 @@ func TestDouYinOpenApi_Code2Session(t *testing.T) {
 	}
 	t.Logf("got a value %+v", session)
 }
-
-func TestDouYinOpenApi_GetEcpm(t *testing.T) {
-
-	// 获取动态的 access_token
-	token := accessToken.NewDefaultAccessToken(AppId, AppSecret, Cache, true)
-
-	at, err := token.GetAccessToken()
-	if err != nil {
-		t.Errorf("got a error: %s", err.Error())
-		return
-	}
-
-	list, err := OpenApi.GetEcpm(GetEcpmParams{
-		AppId:       AppId,
-		OpenId:      "_000aG3MQTzVW-yCUH-ndwv90JIyvdTSD0gf",
-		AccessToken: at,
-		DateHour:    time.Now().Format(time.DateOnly),
-		PageSize:    500,
-		PageNo:      1,
-	})
-
-	if err != nil {
-		t.Errorf("got a error %s", err.Error())
-		return
-	}
-	t.Logf("got a value %+v", list)
-}

app/ecpm/internal/logic/get_ecpm_logic.go

@@ -46,7 +46,7 @@ func (l *GetEcpmLogic) GetEcpm(in *ecpm.GetEcpmRequest) (response *ecpm.GetEcpmR
 	}
 
 	//计算ECPM具体值
-	ecpm := CalcEcpm(list)
+	ecpmVal := CalcEcpm(list)
 
 	//获取后端配置的ECPM值
 	config, ok := l.svcCtx.EcpmConfig.Get(in.AppId)
@@ -55,7 +55,7 @@ func (l *GetEcpmLogic) GetEcpm(in *ecpm.GetEcpmRequest) (response *ecpm.GetEcpmR
 	}
 
 	//判断是否满足条件
-	if ecpm > config.Value && len(list) > config.View {
+	if ecpmVal > config.Value && len(list) > config.View {
 		response.Ok = true
 	}
 

app/ranking/internal/logic/get_ranking_list_logic.go

@@ -48,18 +48,18 @@ func (l *GetRankingListLogic) GetRankingList(in *ranking_management2.GetRankingL
 			continue
 		}
 		//查询用户数据，FindOne带缓存
-		user, err := l.svcCtx.UserManagerClient.GetUserById(l.ctx, &user.UserId{UserId: uint64(userId)})
+		userModel, err := l.svcCtx.UserManagerClient.GetUserById(l.ctx, &user.UserId{UserId: uint64(userId)})
 		if err != nil {
 			return nil, err
 		}
 		data := &ranking_management2.RankingList{
-			Nickname: user.Nickname,
-			Avatar:   user.Avatar,
+			Nickname: userModel.Nickname,
+			Avatar:   userModel.Avatar,
 			Score:    uint32(uint64(datum.Score) >> 32),
 			Rank:     uint32(i) + 1,
-			Self:     user.ID == in.UserId,
+			Self:     userModel.ID == in.UserId,
 		}
-		if user.ID == in.UserId {
+		if userModel.ID == in.UserId {
 			flag = true
 			userRank = data
 		}

app/user_management/internal/logic/create_user_logic.go

@@ -25,7 +25,7 @@ func NewCreateUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Create
 
 // CreateUser 创建用户
 func (l *CreateUserLogic) CreateUser(in *user.CreateUserRequest) (res *user.UserId, err error) {
-	user := l.svcCtx.Query.User
+	userQ := l.svcCtx.Query.User
 	userModel := model.User{
 		Nickname: in.Nickname,
 		Avatar:   in.Avatar,
@@ -35,7 +35,7 @@ func (l *CreateUserLogic) CreateUser(in *user.CreateUserRequest) (res *user.User
 		return nil, err
 	}
 
-	err = user.WithContext(l.ctx).Create(&userModel)
+	err = userQ.WithContext(l.ctx).Create(&userModel)
 	if err != nil {
 		return nil, err
 	}

app/user_management/internal/logic/get_user_by_id_logic.go

@@ -31,14 +31,14 @@ func (l *GetUserByIdLogic) GetUserById(in *user.UserId) (*user.User, error) {
 		return &user.User{}, errors.New("userId is empty")
 	}
 
-	user, err := l.svcCtx.Query.User.WithContext(l.ctx).Where(l.svcCtx.Query.User.ID.Eq(in.UserId)).First()
+	userModel, err := l.svcCtx.Query.User.WithContext(l.ctx).Where(l.svcCtx.Query.User.ID.Eq(in.UserId)).First()
 	if err != nil {
 		return &user.User{}, err
 	}
 
 	return &user.User{
-		ID:       user.ID,
-		Nickname: user.Nickname,
-		Avatar:   user.Avatar,
+		ID:       userModel.ID,
+		Nickname: userModel.Nickname,
+		Avatar:   userModel.Avatar,
 	}, nil
 }

app/user_management/internal/logic/set_user_logic.go

@@ -30,8 +30,8 @@ func (l *SetUserLogic) SetUser(in *user.SetUserRequest) (*user.SetUserResponse,
 	if in.UserId == 0 || in.Nickname == "" || in.Avatar == "" {
 		return nil, errors.New("参数错误")
 	}
-	user := l.svcCtx.Query.User
-	update, err := user.WithContext(l.ctx).Where(user.ID.Eq(in.UserId)).Updates(model.User{
+	userQ := l.svcCtx.Query.User
+	update, err := userQ.WithContext(l.ctx).Where(userQ.ID.Eq(in.UserId)).Updates(model.User{
 		Nickname: in.Nickname,
 		Avatar:   in.Avatar,
 	})