feat:protoc

dev0Tool · May 18, 2023 · 6f56c47 · 6f56c47
1 parent d96494f
commit 6f56c47
Show file tree

Hide file tree

Showing 20 changed files with 1,255 additions and 1,494 deletions.
diff --git a/app/gateway/internal/handler/task.go b/app/gateway/internal/handler/task.go
@@ -6,18 +6,18 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	taskPb "github.com/CocaineCong/grpc-todolist/idl/task"
+	"github.com/CocaineCong/grpc-todolist/idl/task/pb"
 	"github.com/CocaineCong/grpc-todolist/pkg/e"
 	"github.com/CocaineCong/grpc-todolist/pkg/res"
 	"github.com/CocaineCong/grpc-todolist/pkg/util"
 )
 
 func GetTaskList(ginCtx *gin.Context) {
-	var tReq taskPb.TaskRequest
+	var tReq pb.TaskRequest
 	PanicIfTaskError(ginCtx.Bind(&tReq))
 	claim, _ := util.ParseToken(ginCtx.GetHeader("Authorization"))
 	tReq.UserID = uint32(claim.UserID)
-	TaskService := ginCtx.Keys["task"].(taskPb.TaskServiceClient)
+	TaskService := ginCtx.Keys["task"].(pb.TaskServiceClient)
 	TaskResp, err := TaskService.TaskShow(context.Background(), &tReq)
 	PanicIfTaskError(err)
 	r := res.Response{
@@ -29,11 +29,11 @@ func GetTaskList(ginCtx *gin.Context) {
 }
 
 func CreateTask(ginCtx *gin.Context) {
-	var tReq taskPb.TaskRequest
+	var tReq pb.TaskRequest
 	PanicIfTaskError(ginCtx.Bind(&tReq))
 	claim, _ := util.ParseToken(ginCtx.GetHeader("Authorization"))
 	tReq.UserID = uint32(claim.UserID)
-	TaskService := ginCtx.Keys["task"].(taskPb.TaskServiceClient)
+	TaskService := ginCtx.Keys["task"].(pb.TaskServiceClient)
 	TaskResp, err := TaskService.TaskCreate(context.Background(), &tReq)
 	PanicIfTaskError(err)
 	r := res.Response{
@@ -45,11 +45,11 @@ func CreateTask(ginCtx *gin.Context) {
 }
 
 func UpdateTask(ginCtx *gin.Context) {
-	var tReq taskPb.TaskRequest
+	var tReq pb.TaskRequest
 	PanicIfTaskError(ginCtx.Bind(&tReq))
 	claim, _ := util.ParseToken(ginCtx.GetHeader("Authorization"))
 	tReq.UserID = uint32(claim.UserID)
-	TaskService := ginCtx.Keys["task"].(taskPb.TaskServiceClient)
+	TaskService := ginCtx.Keys["task"].(pb.TaskServiceClient)
 	TaskResp, err := TaskService.TaskUpdate(context.Background(), &tReq)
 	PanicIfTaskError(err)
 	r := res.Response{
@@ -61,11 +61,11 @@ func UpdateTask(ginCtx *gin.Context) {
 }
 
 func DeleteTask(ginCtx *gin.Context) {
-	var tReq taskPb.TaskRequest
+	var tReq pb.TaskRequest
 	PanicIfTaskError(ginCtx.Bind(&tReq))
 	claim, _ := util.ParseToken(ginCtx.GetHeader("Authorization"))
 	tReq.UserID = uint32(claim.UserID)
-	TaskService := ginCtx.Keys["task"].(taskPb.TaskServiceClient)
+	TaskService := ginCtx.Keys["task"].(pb.TaskServiceClient)
 	TaskResp, err := TaskService.TaskDelete(context.Background(), &tReq)
 	PanicIfTaskError(err)
 	r := res.Response{

diff --git a/app/gateway/internal/handler/user.go b/app/gateway/internal/handler/user.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	userPb "github.com/CocaineCong/grpc-todolist/idl/user"
+	userPb "github.com/CocaineCong/grpc-todolist/idl/user/pb"
 	"github.com/CocaineCong/grpc-todolist/pkg/e"
 	"github.com/CocaineCong/grpc-todolist/pkg/res"
 	"github.com/CocaineCong/grpc-todolist/pkg/util"

diff --git a/app/user/internal/handler/user.go b/app/user/internal/handler/user.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"sync"
 
+	"github.com/CocaineCong/grpc-todolist/app/user/internal/repository/db/dao"
 	userPb "github.com/CocaineCong/grpc-todolist/idl/user"
 	"github.com/CocaineCong/grpc-todolist/pkg/e"
 )
@@ -24,12 +25,17 @@ func GetUserSrv() *UserSrv {
 func (u *UserSrv) UserLogin(ctx context.Context, req *userPb.UserRequest) (resp *userPb.UserDetailResponse, err error) {
 	resp = new(userPb.UserDetailResponse)
 	resp.Code = e.SUCCESS
-	err = dao..ShowUserInfo(req)
+	r, err := dao.NewUserDao(ctx).GetUserInfo(req)
 	if err != nil {
 		resp.Code = e.ERROR
 		return resp, err
 	}
-	resp.UserDetail = repository.BuildUser(user)
+	userPb.UserModel{
+		UserID:   r.UserID,
+		UserName: r.UserName,
+		NickName: r.UserName,
+	}
+	resp.UserDetail =
 	return resp, nil
 }
 
@@ -46,7 +52,7 @@ func (u *UserSrv) UserRegister(ctx context.Context, req *service.UserRequest) (r
 	return resp, nil
 }
 
-func (u *UserSrv)  UserLogout(ctx context.Context, req *service.UserRequest) (resp *service.UserDetailResponse, err error) {
+func (u *UserSrv) UserLogout(ctx context.Context, req *service.UserRequest) (resp *service.UserDetailResponse, err error) {
 	resp = new(service.UserDetailResponse)
 	return resp, nil
 }
diff --git a/app/user/internal/repository/db/dao/user.go b/app/user/internal/repository/db/dao/user.go
@@ -6,7 +6,8 @@ import (
 
 	"gorm.io/gorm"
 
-	"github.com/CocaineCong/grpc-todolist/idl/user"
+	"github.com/CocaineCong/grpc-todolist/app/user/internal/repository/db/model"
+	userPb "github.com/CocaineCong/grpc-todolist/idl/user"
 	"github.com/CocaineCong/grpc-todolist/pkg/util"
 )
 
@@ -18,45 +19,32 @@ func NewUserDao(ctx context.Context) *UserDao {
 	return &UserDao{NewDBClient(ctx)}
 }
 
-func (user *User) CheckUserExist(req *user.UserRequest) bool {
-	if err := DB.Where("user_name=?", req.UserName).First(&user).Error; err == gorm.ErrRecordNotFound {
-		return false
-	}
-	return true
-}
+// GetUserInfo 获取用户信息
+func (dao *UserDao) GetUserInfo(req *userPb.UserRequest) (r *model.User, err error) {
+	err = dao.Model(&model.User{}).Where("user_name=?", req.UserName).
+		First(&r).Error
 
-func (user *User) ShowUserInfo(req *service.UserRequest) (err error) {
-	if exist := user.CheckUserExist(req); exist {
-		return nil
-	}
-	return errors.New("UserName Not Exist")
+	return
 }
 
-func (*User) Create(req *service.UserRequest) error {
-	var user User
+// CreateUser 用户创建
+func (dao *UserDao) CreateUser(req *userPb.UserRequest) (err error) {
+	var user model.User
 	var count int64
-	DB.Where("user_name=?", req.UserName).Count(&count)
+	dao.Model(&model.User{}).Where("user_name = ?", req.UserName).Count(&count)
 	if count != 0 {
 		return errors.New("UserName Exist")
 	}
-	user = User{
+
+	user = model.User{
 		UserName: req.UserName,
 		NickName: req.NickName,
 	}
 	_ = user.SetPassword(req.Password)
-	if err := DB.Create(&user).Error; err != nil {
+	if err = dao.Model(&model.User{}).Create(&user).Error; err != nil {
 		util.LogrusObj.Error("Insert User Error:" + err.Error())
-		return err
+		return
 	}
-	return nil
-}
 
-// 视图返回
-func BuildUser(item User) *service.UserModel {
-	userModel := service.UserModel{
-		UserID:   uint32(item.UserID),
-		NickName: item.NickName,
-		UserName: item.UserName,
-	}
-	return &userModel
+	return
 }
diff --git a/app/user/internal/repository/db/model/user.go b/app/user/internal/repository/db/model/user.go
@@ -7,7 +7,7 @@ import (
 )
 
 type User struct {
-	UserID         uint   `gorm:"primarykey"`
+	UserID         int64  `gorm:"primarykey"`
 	UserName       string `gorm:"unique"`
 	NickName       string
 	PasswordDigest string