Skip to content

Commit 3f5dd7f

Browse files
CocaineCongCocaineCong
committed
feat:remove gorm useless code
1 parent a5cea47 commit 3f5dd7f

8 files changed

Lines changed: 45 additions & 53 deletions

File tree

‎app/favorite/cmd/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"context"
2222
"net"
2323

24-
"github.com/CocaineCong/tangseng/pkg/prometheus"
25-
"github.com/CocaineCong/tangseng/pkg/tracing"
2624
"github.com/pkg/errors"
25+
"github.com/sirupsen/logrus"
26+
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
27+
"google.golang.org/grpc"
2728

2829
"github.com/CocaineCong/tangseng/app/favorite/internal/service"
2930
"github.com/CocaineCong/tangseng/config"
@@ -32,9 +33,8 @@ import (
3233
"github.com/CocaineCong/tangseng/loading"
3334
"github.com/CocaineCong/tangseng/pkg/discovery"
3435
logs "github.com/CocaineCong/tangseng/pkg/logger"
35-
"github.com/sirupsen/logrus"
36-
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
37-
"google.golang.org/grpc"
36+
"github.com/CocaineCong/tangseng/pkg/prometheus"
37+
"github.com/CocaineCong/tangseng/pkg/tracing"
3838
)
3939

4040
func main() {
@@ -49,7 +49,7 @@ func main() {
4949
Name: config.Conf.Domain[consts.FavoriteServiceName].Name,
5050
Addr: grpcAddress,
5151
}
52-
//注册tracer
52+
// 注册tracer
5353
provider := tracing.InitTracerProvider(config.Conf.Jaeger.Addr, consts.FavoriteServiceName)
5454
defer func() {
5555
if provider == nil {

‎app/favorite/internal/repository/db/dao/favorite.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"context"
2222

2323
"github.com/pkg/errors"
24-
2524
"gorm.io/gorm"
2625

2726
favoritePb "github.com/CocaineCong/tangseng/idl/pb/favorite"
@@ -30,15 +29,15 @@ import (
3029
)
3130

3231
type FavoriteDao struct {
33-
*gorm.DB
32+
db *gorm.DB
3433
}
3534

3635
func NewFavoriteDao(ctx context.Context) *FavoriteDao {
3736
return &FavoriteDao{db.NewDBClient(ctx)}
3837
}
3938

4039
func (dao *FavoriteDao) ListFavorite(req *favoritePb.FavoriteListReq) (r []*model.Favorite, err error) {
41-
err = dao.DB.Model(&model.Favorite{}).
40+
err = dao.db.Model(&model.Favorite{}).
4241
Where("user_id = ?", req.UserId).Find(&r).Error
4342
if err != nil {
4443
return r, errors.Wrapf(err, "failed to query favorite list, userId = %v ", req.UserId)
@@ -51,15 +50,15 @@ func (dao *FavoriteDao) CreateFavorite(req *favoritePb.FavoriteCreateReq) (err e
5150
FavoriteName: req.FavoriteName,
5251
UserID: req.UserId,
5352
}
54-
if err = dao.DB.Create(&favorite).Error; err != nil {
53+
if err = dao.db.Create(&favorite).Error; err != nil {
5554
return errors.Wrapf(err, "failed to create favorite, userId = %v ", req.UserId)
5655
}
5756

5857
return
5958
}
6059

6160
func (dao *FavoriteDao) DeleteFavorite(req *favoritePb.FavoriteDeleteReq) (err error) {
62-
err = dao.DB.Where("favorite_id = ?", req.FavoriteId).
61+
err = dao.db.Where("favorite_id = ?", req.FavoriteId).
6362
Delete(model.Favorite{}).Error
6463
if err != nil {
6564
return errors.Wrapf(err, "failed to delete favorite, favoriteId = %v", req.FavoriteId)
@@ -70,7 +69,7 @@ func (dao *FavoriteDao) DeleteFavorite(req *favoritePb.FavoriteDeleteReq) (err e
7069
func (dao *FavoriteDao) UpdateFavorite(req *favoritePb.FavoriteUpdateReq) (err error) {
7170
fMap := make(map[string]interface{})
7271
fMap["favorite_name"] = req.FavoriteName
73-
err = dao.DB.Where("favorite_id = ?", req.FavoriteId).Updates(&fMap).Error
72+
err = dao.db.Where("favorite_id = ?", req.FavoriteId).Updates(&fMap).Error
7473
if err != nil {
7574
return errors.Wrapf(err, "failed to update favorite, favoriteId = %v ", req.FavoriteId)
7675
}

‎app/favorite/internal/repository/db/dao/favortie_detail.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"context"
2222

2323
"github.com/pkg/errors"
24-
2524
"gorm.io/gorm"
2625

2726
favoritePb "github.com/CocaineCong/tangseng/idl/pb/favorite"
@@ -30,7 +29,7 @@ import (
3029
)
3130

3231
type FavoriteDetailDao struct {
33-
*gorm.DB
32+
db *gorm.DB
3433
}
3534

3635
func NewFavoriteDetailDao(ctx context.Context) *FavoriteDetailDao {
@@ -40,7 +39,7 @@ func NewFavoriteDetailDao(ctx context.Context) *FavoriteDetailDao {
4039
// CreateFavoriteDetail 收藏夹可以重复收藏
4140
func (dao *FavoriteDetailDao) CreateFavoriteDetail(req *favoritePb.FavoriteDetailCreateReq) (err error) {
4241
var f []*model.Favorite
43-
err = dao.DB.Where("favorite_id = ?", req.FavoriteId).Find(&f).Error
42+
err = dao.db.Where("favorite_id = ?", req.FavoriteId).Find(&f).Error
4443
if err != nil {
4544
return errors.Wrapf(err, "failed to query favorite, favoriteId = %v ", req.FavoriteId)
4645
}
@@ -52,7 +51,7 @@ func (dao *FavoriteDetailDao) CreateFavoriteDetail(req *favoritePb.FavoriteDetai
5251
Desc: req.Desc,
5352
Favorite: f,
5453
}
55-
err = dao.DB.Model(&model.FavoriteDetail{}).Create(&fd).Error
54+
err = dao.db.Model(&model.FavoriteDetail{}).Create(&fd).Error
5655
if err != nil {
5756
return errors.Wrapf(err, "failed to create favoriteDetail，userID = %v,urlId = %v", req.UserId, req.UrlId)
5857
}
@@ -61,12 +60,12 @@ func (dao *FavoriteDetailDao) CreateFavoriteDetail(req *favoritePb.FavoriteDetai
6160

6261
func (dao *FavoriteDetailDao) ListFavoriteDetail(req *favoritePb.FavoriteDetailListReq) (r []*model.Favorite, err error) {
6362
var f []*model.Favorite
64-
err = dao.DB.Where("user_id = ?", req.UserId).Find(&f).Error
63+
err = dao.db.Where("user_id = ?", req.UserId).Find(&f).Error
6564
if err != nil {
6665
return r, errors.Wrapf(err, "failed to query favorite, userId = %v ", req.UserId)
6766
}
6867
for _, v := range f {
69-
err = dao.DB.Model(&v).Association("FavoriteDetail").Find(&v.FavoriteDetail)
68+
err = dao.db.Model(&v).Association("FavoriteDetail").Find(&v.FavoriteDetail)
7069
r = append(r, v)
7170
}
7271
if err != nil {
@@ -78,15 +77,15 @@ func (dao *FavoriteDetailDao) ListFavoriteDetail(req *favoritePb.FavoriteDetailL
7877
func (dao *FavoriteDetailDao) DeleteFavoriteDetail(req *favoritePb.FavoriteDetailDeleteReq) (err error) {
7978
var f model.Favorite
8079
var fd model.FavoriteDetail
81-
err = dao.DB.Where("favorite_id = ?", req.FavoriteId).First(&f).Error
80+
err = dao.db.Where("favorite_id = ?", req.FavoriteId).First(&f).Error
8281
if err != nil {
8382
return errors.Wrapf(err, "failed to query favorite, favoriteId = %v ", req.FavoriteId)
8483
}
85-
err = dao.DB.Where("favorite_detail_id = ?", req.FavoriteDetailId).First(&fd).Error
84+
err = dao.db.Where("favorite_detail_id = ?", req.FavoriteDetailId).First(&fd).Error
8685
if err != nil {
8786
return errors.Wrapf(err, "failed to query favoriteDetail, favoriteDetailId = %v ", req.FavoriteDetailId)
8887
}
89-
err = dao.DB.Model(&f).Association("FavoriteDetail").Delete(&fd)
88+
err = dao.db.Model(&f).Association("FavoriteDetail").Delete(&fd)
9089
if err != nil {
9190
return errors.Wrapf(err, "failed to delete favoriteDetail, favoriteDetailId = %v ", req.FavoriteDetailId)
9291
}

‎app/gateway/cmd/main.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,23 @@ import (
2323
"net/http"
2424
"time"
2525

26-
logs "github.com/CocaineCong/tangseng/pkg/logger"
27-
28-
"github.com/CocaineCong/tangseng/consts"
29-
"github.com/CocaineCong/tangseng/pkg/tracing"
30-
3126
"github.com/sirupsen/logrus"
3227
"google.golang.org/grpc/resolver"
3328

3429
"github.com/CocaineCong/tangseng/app/gateway/routes"
3530
"github.com/CocaineCong/tangseng/app/gateway/rpc"
3631
"github.com/CocaineCong/tangseng/config"
32+
"github.com/CocaineCong/tangseng/consts"
3733
"github.com/CocaineCong/tangseng/loading"
3834
"github.com/CocaineCong/tangseng/pkg/discovery"
35+
logs "github.com/CocaineCong/tangseng/pkg/logger"
36+
"github.com/CocaineCong/tangseng/pkg/tracing"
3937
)
4038

4139
func main() {
4240
loading.Loading()
4341
rpc.Init()
44-
////注册tracer
42+
// 注册tracer
4543
provider := tracing.InitTracerProvider(config.Conf.Jaeger.Addr, consts.ServiceName)
4644
defer func() {
4745
if provider == nil {

‎app/gateway/http/favorites.go‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ package http
2020
import (
2121
"net/http"
2222

23-
"github.com/pkg/errors"
24-
2523
"github.com/gin-gonic/gin"
24+
"github.com/pkg/errors"
2625

2726
"github.com/CocaineCong/tangseng/app/gateway/rpc"
2827
pb "github.com/CocaineCong/tangseng/idl/pb/favorite"
@@ -37,15 +36,7 @@ func ListFavorite(ctx *gin.Context) {
3736
ctx.JSON(http.StatusOK, ctl.RespError(ctx, err, "绑定参数错误"))
3837
return
3938
}
40-
user, err := ctl.GetUserInfo(ctx.Request.Context())
41-
if err != nil {
42-
log.LogrusObj.Errorf("ctl.GetUserInfo failed, original error: %T %v", errors.Cause(err), errors.Cause(err))
43-
log.LogrusObj.Errorf("stack trace: \n%+v\n", err)
44-
ctx.JSON(http.StatusOK, ctl.RespError(ctx, err, "获取用户信息错误"))
45-
return
46-
}
47-
req.UserId = user.Id
48-
r, err := rpc.FavoriteList(ctx, &req)
39+
r, err := rpc.FavoriteList(ctx.Request.Context(), &req)
4940
if err != nil {
5041
log.LogrusObj.Errorf("rpc.FavoriteList failed, original error: %T %v", errors.Cause(err), errors.Cause(err))
5142
log.LogrusObj.Errorf("stack trace: \n%+v\n", err)

‎app/gateway/rpc/favorite.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
"github.com/CocaineCong/tangseng/consts/e"
2626
favoritePb "github.com/CocaineCong/tangseng/idl/pb/favorite"
27+
"github.com/CocaineCong/tangseng/pkg/ctl"
2728
)
2829

2930
func FavoriteCreate(ctx context.Context, req *favoritePb.FavoriteCreateReq) (resp *favoritePb.FavoriteCommonResponse, err error) {
@@ -56,6 +57,12 @@ func FavoriteUpdate(ctx context.Context, req *favoritePb.FavoriteUpdateReq) (res
5657
}
5758

5859
func FavoriteList(ctx context.Context, req *favoritePb.FavoriteListReq) (resp *favoritePb.FavoriteListResponse, err error) {
60+
user, err := ctl.GetUserInfo(ctx)
61+
if err != nil {
62+
err = errors.WithMessage(err, "FavoriteList.GetUserInfo error")
63+
return
64+
}
65+
req.UserId = user.Id
5966
resp, err = FavoriteClient.FavoriteList(ctx, req)
6067
if err != nil {
6168
err = errors.WithMessage(err, "FavoriteClient.FavoriteList error")

‎app/user/internal/repository/db/dao/user.go‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"context"
2222

2323
"github.com/pkg/errors"
24-
2524
"gorm.io/gorm"
2625

2726
userPb "github.com/CocaineCong/tangseng/idl/pb/user"
@@ -30,7 +29,7 @@ import (
3029
)
3130

3231
type UserDao struct {
33-
*gorm.DB
32+
db *gorm.DB
3433
}
3534

3635
func NewUserDao(ctx context.Context) *UserDao {
@@ -39,7 +38,7 @@ func NewUserDao(ctx context.Context) *UserDao {
3938

4039
// GetUserInfo 获取用户信息
4140
func (dao *UserDao) GetUserInfo(req *userPb.UserLoginReq) (r *model.User, err error) {
42-
err = dao.Model(&model.User{}).Where("user_name=?", req.UserName).
41+
err = dao.db.Model(&model.User{}).Where("user_name = ?", req.UserName).
4342
First(&r).Error
4443
if err != nil {
4544
err = errors.Wrapf(err, "failed to get user info, userName = %v", req.UserName)
@@ -48,20 +47,13 @@ func (dao *UserDao) GetUserInfo(req *userPb.UserLoginReq) (r *model.User, err er
4847
}
4948

5049
// CreateUser 用户创建
51-
func (dao *UserDao) CreateUser(req *userPb.UserRegisterReq) (err error) {
52-
var user model.User
50+
func (dao *UserDao) CreateUser(in *model.User) (err error) {
5351
var count int64
54-
dao.Model(&model.User{}).Where("user_name = ?", req.UserName).Count(&count)
52+
dao.db.Model(&model.User{}).Where("user_name = ?", in.UserName).Count(&count)
5553
if count != 0 {
56-
return errors.Wrapf(errors.New("UserName Exist"), "failed to create user, userName = %v", req.UserName)
57-
}
58-
59-
user = model.User{
60-
UserName: req.UserName,
61-
NickName: req.NickName,
54+
return errors.Wrapf(errors.New("UserName Exist"), "failed to create user, userName = %v", in.UserName)
6255
}
63-
_ = user.SetPassword(req.Password)
64-
if err = dao.Model(&model.User{}).Create(&user).Error; err != nil {
56+
if err = dao.db.Model(&model.User{}).Create(&in).Error; err != nil {
6557
return errors.Wrap(err, "failed to create user")
6658
}
6759

‎app/user/internal/service/user.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/CocaineCong/tangseng/app/user/internal/repository/db/dao"
2727
e2 "github.com/CocaineCong/tangseng/consts/e"
2828
pb "github.com/CocaineCong/tangseng/idl/pb/user"
29+
"github.com/CocaineCong/tangseng/repository/mysql/model"
2930
)
3031

3132
var UserSrvIns *UserSrv
@@ -62,7 +63,12 @@ func (u *UserSrv) UserLogin(ctx context.Context, req *pb.UserLoginReq) (resp *pb
6263
func (u *UserSrv) UserRegister(ctx context.Context, req *pb.UserRegisterReq) (resp *pb.UserCommonResponse, err error) {
6364
resp = new(pb.UserCommonResponse)
6465
resp.Code = e2.SUCCESS
65-
err = dao.NewUserDao(ctx).CreateUser(req)
66+
user := &model.User{
67+
UserName: req.UserName,
68+
NickName: req.NickName,
69+
}
70+
_ = user.SetPassword(req.Password)
71+
err = dao.NewUserDao(ctx).CreateUser(user)
6672
if err != nil {
6773
resp.Code = e2.ERROR
6874
err = errors.WithMessage(err, "createUser error")

0 commit comments

Comments
 (0)