Skip to content

Commit d5534b8

Browse files
zhufuyizhufuyi
committed
adjustment code
1 parent 52ec841 commit d5534b8

File tree

60 files changed

+226
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+226
-183
lines changed

‎1_web-gin-CRUD/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[**web-gin-CRUD 中文说明**](https://www.bilibili.com/read/cv23018269)
1+
[**web-gin-CRUD 中文说明**](https://juejin.cn/post/7298167437526122496)
22

33
<br>
44

‎1_web-gin-CRUD/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a
1212
github.com/swaggo/gin-swagger v1.5.2
1313
github.com/swaggo/swag v1.8.12
14-
github.com/zhufuyi/sponge v1.5.6
14+
github.com/zhufuyi/sponge v1.5.7
1515
golang.org/x/sync v0.1.0
1616
gorm.io/gorm v1.25.4
1717
)

‎1_web-gin-CRUD/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,8 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi
592592
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
593593
github.com/zhufuyi/sponge v1.5.6 h1:PlmHVD2wRzG7LIuWyb6YyhycTGo8c5M8CoLqMPFfzJw=
594594
github.com/zhufuyi/sponge v1.5.6/go.mod h1:jqHdQEmKK7tDUTrecEWhq0c2UO1WE5/HjaY2y4dGmEE=
595+
github.com/zhufuyi/sponge v1.5.7 h1:qb3FbgeBel3drC82NfRWpGQBsvFS4eqgRS3bm+IZQz8=
596+
github.com/zhufuyi/sponge v1.5.7/go.mod h1:jqHdQEmKK7tDUTrecEWhq0c2UO1WE5/HjaY2y4dGmEE=
595597
go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc=
596598
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
597599
go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg=

‎2_micro-grpc-CRUD/README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[**micro-grpc-CRUD 中文说明**](https://www.bilibili.com/read/cv23064432)
1+
2+
[**micro-grpc-CRUD 中文说明**](https://juejin.cn/post/7225257817346129981)
23

34
<br>
45

@@ -20,8 +21,6 @@ Switch to the user directory and run the command:
2021
# Generate pb.go code
2122
make proto
2223

23-
# Open the file internal/service/teacher.go and fill in the specific logic code according to the template code.
24-
2524
# Compile and start grpc service
2625
make run
2726
```

‎2_micro-grpc-CRUD/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
99
github.com/jinzhu/copier v0.3.5
1010
github.com/stretchr/testify v1.8.4
11-
github.com/zhufuyi/sponge v1.5.6
11+
github.com/zhufuyi/sponge v1.5.7
1212
go.uber.org/zap v1.21.0
1313
golang.org/x/sync v0.1.0
1414
google.golang.org/grpc v1.53.0

‎2_micro-grpc-CRUD/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,8 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi
583583
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
584584
github.com/zhufuyi/sponge v1.5.6 h1:PlmHVD2wRzG7LIuWyb6YyhycTGo8c5M8CoLqMPFfzJw=
585585
github.com/zhufuyi/sponge v1.5.6/go.mod h1:jqHdQEmKK7tDUTrecEWhq0c2UO1WE5/HjaY2y4dGmEE=
586+
github.com/zhufuyi/sponge v1.5.7 h1:qb3FbgeBel3drC82NfRWpGQBsvFS4eqgRS3bm+IZQz8=
587+
github.com/zhufuyi/sponge v1.5.7/go.mod h1:jqHdQEmKK7tDUTrecEWhq0c2UO1WE5/HjaY2y4dGmEE=
586588
go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc=
587589
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
588590
go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg=

‎2_micro-grpc-CRUD/internal/service/course.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (s *course) Create(ctx context.Context, req *userV1.CreateCourseRequest) (*
5757
return nil, ecode.StatusCreateCourse.Err()
5858
}
5959

60-
//ctx = interceptor.WrapServerCtx(ctx)
60+
ctx = interceptor.WrapServerCtx(ctx)
6161
err = s.iDao.Create(ctx, record)
6262
if err != nil {
6363
logger.Error("Create error", logger.Err(err), logger.Any("course", record), interceptor.ServerCtxRequestIDField(ctx))
@@ -75,7 +75,7 @@ func (s *course) DeleteByID(ctx context.Context, req *userV1.DeleteCourseByIDReq
7575
return nil, ecode.StatusInvalidParams.Err()
7676
}
7777

78-
//ctx = interceptor.WrapServerCtx(ctx)
78+
ctx = interceptor.WrapServerCtx(ctx)
7979
err = s.iDao.DeleteByID(ctx, req.Id)
8080
if err != nil {
8181
logger.Error("DeleteByID error", logger.Err(err), logger.Any("id", req.Id), interceptor.ServerCtxRequestIDField(ctx))
@@ -93,7 +93,7 @@ func (s *course) DeleteByIDs(ctx context.Context, req *userV1.DeleteCourseByIDsR
9393
return nil, ecode.StatusInvalidParams.Err()
9494
}
9595

96-
//ctx = interceptor.WrapServerCtx(ctx)
96+
ctx = interceptor.WrapServerCtx(ctx)
9797
err = s.iDao.DeleteByIDs(ctx, req.Ids)
9898
if err != nil {
9999
logger.Error("DeleteByID error", logger.Err(err), logger.Any("ids", req.Ids), interceptor.ServerCtxRequestIDField(ctx))
@@ -118,7 +118,7 @@ func (s *course) UpdateByID(ctx context.Context, req *userV1.UpdateCourseByIDReq
118118
}
119119
record.ID = req.Id
120120

121-
//ctx = interceptor.WrapServerCtx(ctx)
121+
ctx = interceptor.WrapServerCtx(ctx)
122122
err = s.iDao.UpdateByID(ctx, record)
123123
if err != nil {
124124
logger.Error("UpdateByID error", logger.Err(err), logger.Any("course", record), interceptor.ServerCtxRequestIDField(ctx))
@@ -136,7 +136,7 @@ func (s *course) GetByID(ctx context.Context, req *userV1.GetCourseByIDRequest)
136136
return nil, ecode.StatusInvalidParams.Err()
137137
}
138138

139-
//ctx = interceptor.WrapServerCtx(ctx)
139+
ctx = interceptor.WrapServerCtx(ctx)
140140
record, err := s.iDao.GetByID(ctx, req.Id)
141141
if err != nil {
142142
if errors.Is(err, query.ErrNotFound) {
@@ -164,7 +164,7 @@ func (s *course) GetByCondition(ctx context.Context, req *userV1.GetCourseByCond
164164
return nil, ecode.StatusInvalidParams.Err()
165165
}
166166

167-
//ctx = interceptor.WrapServerCtx(ctx)
167+
ctx = interceptor.WrapServerCtx(ctx)
168168
conditions := &query.Conditions{}
169169
for _, v := range req.Conditions.GetColumns() {
170170
column := query.Column{}
@@ -206,7 +206,7 @@ func (s *course) ListByIDs(ctx context.Context, req *userV1.ListCourseByIDsReque
206206
return nil, ecode.StatusInvalidParams.Err()
207207
}
208208

209-
//ctx = interceptor.WrapServerCtx(ctx)
209+
ctx = interceptor.WrapServerCtx(ctx)
210210
courseMap, err := s.iDao.GetByIDs(ctx, req.Ids)
211211
if err != nil {
212212
logger.Error("GetByIDs error", logger.Err(err), logger.Any("ids", req.Ids), interceptor.ServerCtxRequestIDField(ctx))
@@ -243,7 +243,7 @@ func (s *course) List(ctx context.Context, req *userV1.ListCourseRequest) (*user
243243
}
244244
params.Size = int(req.Params.Limit)
245245

246-
//ctx = interceptor.WrapServerCtx(ctx)
246+
ctx = interceptor.WrapServerCtx(ctx)
247247
records, total, err := s.iDao.GetByColumns(ctx, params)
248248
if err != nil {
249249
if strings.Contains(err.Error(), "query params error:") {

‎2_micro-grpc-CRUD/internal/service/teach.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (s *teach) Create(ctx context.Context, req *userV1.CreateTeachRequest) (*us
5757
return nil, ecode.StatusCreateTeach.Err()
5858
}
5959

60-
//ctx = interceptor.WrapServerCtx(ctx)
60+
ctx = interceptor.WrapServerCtx(ctx)
6161
err = s.iDao.Create(ctx, record)
6262
if err != nil {
6363
logger.Error("Create error", logger.Err(err), logger.Any("teach", record), interceptor.ServerCtxRequestIDField(ctx))
@@ -75,7 +75,7 @@ func (s *teach) DeleteByID(ctx context.Context, req *userV1.DeleteTeachByIDReque
7575
return nil, ecode.StatusInvalidParams.Err()
7676
}
7777

78-
//ctx = interceptor.WrapServerCtx(ctx)
78+
ctx = interceptor.WrapServerCtx(ctx)
7979
err = s.iDao.DeleteByID(ctx, req.Id)
8080
if err != nil {
8181
logger.Error("DeleteByID error", logger.Err(err), logger.Any("id", req.Id), interceptor.ServerCtxRequestIDField(ctx))
@@ -93,7 +93,7 @@ func (s *teach) DeleteByIDs(ctx context.Context, req *userV1.DeleteTeachByIDsReq
9393
return nil, ecode.StatusInvalidParams.Err()
9494
}
9595

96-
//ctx = interceptor.WrapServerCtx(ctx)
96+
ctx = interceptor.WrapServerCtx(ctx)
9797
err = s.iDao.DeleteByIDs(ctx, req.Ids)
9898
if err != nil {
9999
logger.Error("DeleteByID error", logger.Err(err), logger.Any("ids", req.Ids), interceptor.ServerCtxRequestIDField(ctx))
@@ -118,7 +118,7 @@ func (s *teach) UpdateByID(ctx context.Context, req *userV1.UpdateTeachByIDReque
118118
}
119119
record.ID = req.Id
120120

121-
//ctx = interceptor.WrapServerCtx(ctx)
121+
ctx = interceptor.WrapServerCtx(ctx)
122122
err = s.iDao.UpdateByID(ctx, record)
123123
if err != nil {
124124
logger.Error("UpdateByID error", logger.Err(err), logger.Any("teach", record), interceptor.ServerCtxRequestIDField(ctx))
@@ -136,7 +136,7 @@ func (s *teach) GetByID(ctx context.Context, req *userV1.GetTeachByIDRequest) (*
136136
return nil, ecode.StatusInvalidParams.Err()
137137
}
138138

139-
//ctx = interceptor.WrapServerCtx(ctx)
139+
ctx = interceptor.WrapServerCtx(ctx)
140140
record, err := s.iDao.GetByID(ctx, req.Id)
141141
if err != nil {
142142
if errors.Is(err, query.ErrNotFound) {
@@ -164,7 +164,7 @@ func (s *teach) GetByCondition(ctx context.Context, req *userV1.GetTeachByCondit
164164
return nil, ecode.StatusInvalidParams.Err()
165165
}
166166

167-
//ctx = interceptor.WrapServerCtx(ctx)
167+
ctx = interceptor.WrapServerCtx(ctx)
168168
conditions := &query.Conditions{}
169169
for _, v := range req.Conditions.GetColumns() {
170170
column := query.Column{}
@@ -206,7 +206,7 @@ func (s *teach) ListByIDs(ctx context.Context, req *userV1.ListTeachByIDsRequest
206206
return nil, ecode.StatusInvalidParams.Err()
207207
}
208208

209-
//ctx = interceptor.WrapServerCtx(ctx)
209+
ctx = interceptor.WrapServerCtx(ctx)
210210
teachMap, err := s.iDao.GetByIDs(ctx, req.Ids)
211211
if err != nil {
212212
logger.Error("GetByIDs error", logger.Err(err), logger.Any("ids", req.Ids), interceptor.ServerCtxRequestIDField(ctx))
@@ -243,7 +243,7 @@ func (s *teach) List(ctx context.Context, req *userV1.ListTeachRequest) (*userV1
243243
}
244244
params.Size = int(req.Params.Limit)
245245

246-
//ctx = interceptor.WrapServerCtx(ctx)
246+
ctx = interceptor.WrapServerCtx(ctx)
247247
records, total, err := s.iDao.GetByColumns(ctx, params)
248248
if err != nil {
249249
if strings.Contains(err.Error(), "query params error:") {

‎2_micro-grpc-CRUD/internal/service/teacher.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (s *teacher) Create(ctx context.Context, req *userV1.CreateTeacherRequest)
5757
return nil, ecode.StatusCreateTeacher.Err()
5858
}
5959

60-
//ctx = interceptor.WrapServerCtx(ctx)
60+
ctx = interceptor.WrapServerCtx(ctx)
6161
err = s.iDao.Create(ctx, record)
6262
if err != nil {
6363
logger.Error("Create error", logger.Err(err), logger.Any("teacher", record), interceptor.ServerCtxRequestIDField(ctx))
@@ -75,7 +75,7 @@ func (s *teacher) DeleteByID(ctx context.Context, req *userV1.DeleteTeacherByIDR
7575
return nil, ecode.StatusInvalidParams.Err()
7676
}
7777

78-
//ctx = interceptor.WrapServerCtx(ctx)
78+
ctx = interceptor.WrapServerCtx(ctx)
7979
err = s.iDao.DeleteByID(ctx, req.Id)
8080
if err != nil {
8181
logger.Error("DeleteByID error", logger.Err(err), logger.Any("id", req.Id), interceptor.ServerCtxRequestIDField(ctx))
@@ -93,7 +93,7 @@ func (s *teacher) DeleteByIDs(ctx context.Context, req *userV1.DeleteTeacherByID
9393
return nil, ecode.StatusInvalidParams.Err()
9494
}
9595

96-
//ctx = interceptor.WrapServerCtx(ctx)
96+
ctx = interceptor.WrapServerCtx(ctx)
9797
err = s.iDao.DeleteByIDs(ctx, req.Ids)
9898
if err != nil {
9999
logger.Error("DeleteByID error", logger.Err(err), logger.Any("ids", req.Ids), interceptor.ServerCtxRequestIDField(ctx))
@@ -118,7 +118,7 @@ func (s *teacher) UpdateByID(ctx context.Context, req *userV1.UpdateTeacherByIDR
118118
}
119119
record.ID = req.Id
120120

121-
//ctx = interceptor.WrapServerCtx(ctx)
121+
ctx = interceptor.WrapServerCtx(ctx)
122122
err = s.iDao.UpdateByID(ctx, record)
123123
if err != nil {
124124
logger.Error("UpdateByID error", logger.Err(err), logger.Any("teacher", record), interceptor.ServerCtxRequestIDField(ctx))
@@ -136,7 +136,7 @@ func (s *teacher) GetByID(ctx context.Context, req *userV1.GetTeacherByIDRequest
136136
return nil, ecode.StatusInvalidParams.Err()
137137
}
138138

139-
//ctx = interceptor.WrapServerCtx(ctx)
139+
ctx = interceptor.WrapServerCtx(ctx)
140140
record, err := s.iDao.GetByID(ctx, req.Id)
141141
if err != nil {
142142
if errors.Is(err, query.ErrNotFound) {
@@ -164,7 +164,7 @@ func (s *teacher) GetByCondition(ctx context.Context, req *userV1.GetTeacherByCo
164164
return nil, ecode.StatusInvalidParams.Err()
165165
}
166166

167-
//ctx = interceptor.WrapServerCtx(ctx)
167+
ctx = interceptor.WrapServerCtx(ctx)
168168
conditions := &query.Conditions{}
169169
for _, v := range req.Conditions.GetColumns() {
170170
column := query.Column{}
@@ -206,7 +206,7 @@ func (s *teacher) ListByIDs(ctx context.Context, req *userV1.ListTeacherByIDsReq
206206
return nil, ecode.StatusInvalidParams.Err()
207207
}
208208

209-
//ctx = interceptor.WrapServerCtx(ctx)
209+
ctx = interceptor.WrapServerCtx(ctx)
210210
teacherMap, err := s.iDao.GetByIDs(ctx, req.Ids)
211211
if err != nil {
212212
logger.Error("GetByIDs error", logger.Err(err), logger.Any("ids", req.Ids), interceptor.ServerCtxRequestIDField(ctx))
@@ -243,7 +243,7 @@ func (s *teacher) List(ctx context.Context, req *userV1.ListTeacherRequest) (*us
243243
}
244244
params.Size = int(req.Params.Limit)
245245

246-
//ctx = interceptor.WrapServerCtx(ctx)
246+
ctx = interceptor.WrapServerCtx(ctx)
247247
records, total, err := s.iDao.GetByColumns(ctx, params)
248248
if err != nil {
249249
if strings.Contains(err.Error(), "query params error:") {

0 commit comments

Comments
 (0)