From 2f4423177178290893718302bf96db7e98923910 Mon Sep 17 00:00:00 2001
From: 13451294168 <2211316490@qq.com>
Date: Mon, 17 Jun 2024 10:13:44 +0800
Subject: [PATCH] 1.7

---
 go_fabric/api/v1/poem.go   |  6 +++---
 go_fabric/dao/poem.go      |  4 ++--
 go_fabric/routes/router.go | 14 --------------
 go_fabric/service/poem.go  | 31 ++-----------------------------
 4 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/go_fabric/api/v1/poem.go b/go_fabric/api/v1/poem.go
index 5a35076..e0022ac 100644
--- a/go_fabric/api/v1/poem.go
+++ b/go_fabric/api/v1/poem.go
@@ -9,9 +9,9 @@ import (
 )
 
 func PoemGet(c *gin.Context) {
-	var userRegister service.PoemService
-	if err := c.ShouldBind(&userRegister); err == nil {
-		res := userRegister.Register(c.Request.Context())
+	var PoemGet service.PoemService
+	if err := c.ShouldBind(&PoemGet); err == nil {
+		res := PoemGet.GetPoems(c.Request.Context())
 		c.JSON(http.StatusOK, res)
 	} else {
 		c.JSON(http.StatusBadRequest, ErrorResponse(err)) //400参数错误
diff --git a/go_fabric/dao/poem.go b/go_fabric/dao/poem.go
index 92e14c3..6ea9cbb 100644
--- a/go_fabric/dao/poem.go
+++ b/go_fabric/dao/poem.go
@@ -20,8 +20,8 @@ func NewPomeDaoDB(db *gorm.DB) *PoemDao {
 }
 
 // 根据Id寻找诗句
-func (dao *PoemDao) GetUserById(id uint) (user *model.Poem, err error) {
-	err = dao.DB.Model(&model.Poem{}).Where("id=?", id).First(&user).Error
+func (dao *PoemDao) GetUserById(Id uint) (user *model.Poem, err error) {
+	err = dao.DB.Model(&model.Poem{}).Where("id=?", Id).First(&user).Error
 	return
 }
 
diff --git a/go_fabric/routes/router.go b/go_fabric/routes/router.go
index e78c592..70af258 100644
--- a/go_fabric/routes/router.go
+++ b/go_fabric/routes/router.go
@@ -21,20 +21,6 @@ func NewRouter() *gin.Engine {
 		})
 		//获取诗词
 		v1.GET("poem/gain", api.PoemGet)
-
-		//用户操作
-		v1.POST("user/register", api.UserRegister)
-		v1.POST("user/login", api.UserLogin)
-
-		authed := v1.Group("/") //登录保护
-		authed.Use(middleware.JWT())
-		{
-			// 用户操作
-			authed.PUT("user", api.UserUpdate)              //用户信息更新
-			authed.POST("avatar", api.UpdateAvatar)         //用户上传头像
-			authed.POST("user/send-email", api.SendEmail)   //发送验证邮件
-			authed.POST("user/valid-email", api.ValidEmail) //绑定邮箱
-		}
 	}
 	return r
 }
diff --git a/go_fabric/service/poem.go b/go_fabric/service/poem.go
index d8fbe8c..b671bb6 100644
--- a/go_fabric/service/poem.go
+++ b/go_fabric/service/poem.go
@@ -2,14 +2,7 @@ package service
 
 import (
 	"context"
-	"go_fabric/conf"
-	"go_fabric/dao"
-	"go_fabric/model"
-	"go_fabric/pkg/e"
-	"go_fabric/pkg/util"
 	"go_fabric/serializer"
-
-	"gopkg.in/mail.v2"
 )
 
 type PoemService struct {
@@ -20,27 +13,7 @@ type PoemService struct {
 type ValidEmailService struct {
 }
 
-func (service *PoemService) Update(ctx context.Context, uId uint) serializer.Response {
-	var Poem *model.Poem
-	var err error
-	code := e.Success
-	//寻找诗句
-	PoemDao := dao.NewPoemDao(ctx)
-	Poem, err = PoemDao.GetPoemById(uId)
+// 寻找诗句
+func (service *PoemService) GetPoems(ctx context.Context, aId string) serializer.Response {
 
-	d := mail.NewDialer(conf.SmtpHost, 465, conf.SmtpEmail, conf.SmtpPass)
-	d.StartTLSPolicy = mail.MandatoryStartTLS
-	if err = d.DialAndSend(m); err != nil {
-		util.LoggerObj.Error(err)
-		code = e.ErrorSendEmail
-		return serializer.Response{
-			Status: code,
-			Msg:    e.GetMsg(code),
-			Error:  err.Error(),
-		}
-	}
-	return serializer.Response{
-		Status: code,
-		Msg:    e.GetMsg(code),
-	}
 }