feat: 优化句子接口

Author: oldme-git

api/other/app/other.go

@@ -46,10 +46,20 @@ type (
 
 type (
 	PoemReq struct {
-		g.Meta `path:"poem" method:"get" sm:"随即查询诗词" tags:"app"`
+		g.Meta `path:"poem" method:"get" sm:"随机查询诗词" tags:"app"`
 	}
 
 	PoemRes struct {
-		Text string `json:"text"`
+		Poem string `json:"poem"`
+	}
+)
+
+type (
+	SlangReq struct {
+		g.Meta `path:"slang" method:"get" sm:"随机查询俚语" tags:"app"`
+	}
+
+	SlangRes struct {
+		Slang string `json:"slang"`
 	}
 )

api/other/other.go

@@ -5,14 +5,15 @@ import (
 
 	"github.com/oldme-git/oldme-api/api/other/app"
 	"github.com/oldme-git/oldme-api/internal/logic/sentence"
+	"github.com/oldme-git/oldme-api/utility/uinit"
 )
 
 func (c *ControllerApp) Poem(ctx context.Context, req *app.PoemReq) (res *app.PoemRes, err error) {
-	poem, err := sentence.Poem(ctx)
+	text, err := sentence.Text(ctx, uinit.PoemTagId)
 	if err != nil {
 		return nil, err
 	}
 	return &app.PoemRes{
-		Text: poem.Sentence,
+		Poem: text.Sentence,
 	}, nil
 }

internal/controller/other/other_app_poem.go

@@ -5,14 +5,15 @@ import (
 
 	"github.com/oldme-git/oldme-api/api/other/app"
 	"github.com/oldme-git/oldme-api/internal/logic/sentence"
+	"github.com/oldme-git/oldme-api/utility/uinit"
 )
 
 func (c *ControllerApp) Saying(ctx context.Context, req *app.SayingReq) (res *app.SayingRes, err error) {
-	saying, err := sentence.Saying(ctx)
+	text, err := sentence.Text(ctx, uinit.SayingTagId)
 	if err != nil {
 		return nil, err
 	}
 	return &app.SayingRes{
-		Saying: saying.Sentence,
+		Saying: text.Sentence,
 	}, nil
 }

internal/controller/other/other_app_saying.go

@@ -0,0 +1,20 @@
+package other
+
+import (
+	"context"
+
+	"github.com/oldme-git/oldme-api/internal/logic/sentence"
+	"github.com/oldme-git/oldme-api/utility/uinit"
+
+	"github.com/oldme-git/oldme-api/api/other/app"
+)
+
+func (c *ControllerApp) Slang(ctx context.Context, req *app.SlangReq) (res *app.SlangRes, err error) {
+	text, err := sentence.Text(ctx, uinit.SlangTagId)
+	if err != nil {
+		return nil, err
+	}
+	return &app.SlangRes{
+		Slang: text.Sentence,
+	}, nil
+}

internal/controller/other/other_app_slang.go

@@ -10,7 +10,6 @@ import (
 	"github.com/oldme-git/oldme-api/internal/model/do"
 	"github.com/oldme-git/oldme-api/internal/model/entity"
 	"github.com/oldme-git/oldme-api/internal/utility"
-	"github.com/oldme-git/oldme-api/utility/uinit"
 )
 
 // Cre 创建句子
@@ -214,33 +213,12 @@ func GetIdsByTagIds(ctx context.Context, tagIds []model.Id, p model.Paging) (ids
 	return
 }
 
-// Saying 随机读取一句话，用于首页展示
-func Saying(ctx context.Context) (info *entity.Sentence, err error) {
+// Text 根据 tagId 随机读取一个句子
+func Text(ctx context.Context, tagId uint32) (info *entity.Sentence, err error) {
 	db := dao.SentenceTag.Ctx(ctx).
 		Fields("s_id").
+		Where("t_id", tagId).
 		OrderRandom()
-	if uinit.SayingTagId > 0 {
-		db = db.Where("t_id", uinit.SayingTagId)
-	}
-
-	idData, err := db.Limit(1).One()
-	if err != nil {
-		err = utility.Err.Sys(err)
-	}
-	id := model.Id(idData["s_id"].Int())
-	info, err = Show(ctx, id)
-
-	return
-}
-
-// Poem 随机读取诗词
-func Poem(ctx context.Context) (info *entity.Sentence, err error) {
-	db := dao.SentenceTag.Ctx(ctx).
-		Fields("s_id").
-		OrderRandom()
-	if uinit.PoemTagId > 0 {
-		db = db.Where("t_id", uinit.PoemTagId)
-	}
 
 	idData, err := db.Limit(1).One()
 	if err != nil {

internal/logic/sentence/sentence.go

@@ -7,12 +7,16 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 )
 
-var SayingTagId uint32
-var PoemTagId uint32
+var (
+	SayingTagId uint32
+	PoemTagId   uint32
+	SlangTagId  uint32
+)
 
 func init() {
 	sayingTagId()
 	poemTagId()
+	slangTagId()
 }
 
 // sayingTagId 获取短句标签id，用于首页展示
@@ -38,3 +42,15 @@ func poemTagId() {
 		PoemTagId = idRaw.Uint32()
 	}
 }
+
+// slangTagId 获取俚语标签id
+// 从配置文件中获取
+func slangTagId() {
+	cfg, _ := gcfg.New()
+	idRaw, err := cfg.Get(gctx.New(), "slangTagId")
+	if err != nil {
+		SlangTagId = 0
+	} else {
+		SlangTagId = idRaw.Uint32()
+	}
+}