From 27d16b6d82bf4b99a054d4252727c7086c2d07b5 Mon Sep 17 00:00:00 2001 From: majun <3060162534@qq.com> Date: Wed, 11 Dec 2024 13:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- link_homework/api/v1/hello.go | 1 - link_homework/api/v1/homework/homework.go | 6 ++++ link_homework/internal/cmd/cmd.go | 4 ++- .../internal/controller/clientPage/clientPage.go | 1 - .../internal/controller/homework/homework.go | 25 ++++++++++++++++ link_homework/internal/logic/homework/homework.go | 24 ++++++++++++++++ .../model/entity/activity_interactive_group.go | 5 +++- link_homework/internal/service/homework.go | 33 ++++++++++++++++++++++ link_homework/internal/service/middleware.go | 8 ++++++ 9 files changed, 103 insertions(+), 4 deletions(-) delete mode 100644 link_homework/api/v1/hello.go create mode 100644 link_homework/api/v1/homework/homework.go delete mode 100644 link_homework/internal/controller/clientPage/clientPage.go create mode 100644 link_homework/internal/controller/homework/homework.go create mode 100644 link_homework/internal/logic/homework/homework.go create mode 100644 link_homework/internal/service/homework.go create mode 100644 link_homework/internal/service/middleware.go diff --git a/link_homework/api/v1/hello.go b/link_homework/api/v1/hello.go deleted file mode 100644 index b7b1f99..0000000 --- a/link_homework/api/v1/hello.go +++ /dev/null @@ -1 +0,0 @@ -package v1 diff --git a/link_homework/api/v1/homework/homework.go b/link_homework/api/v1/homework/homework.go new file mode 100644 index 0000000..09ad117 --- /dev/null +++ b/link_homework/api/v1/homework/homework.go @@ -0,0 +1,6 @@ +package homework + +type GetHomeworkListReq struct { + PageNo int `v:"required#页码不能为空" dc:"页码"` + PageSize int `v:"required#页面大小不能为空" dc:"页面大小"` +} diff --git a/link_homework/internal/cmd/cmd.go b/link_homework/internal/cmd/cmd.go index 4a0a6af..a6fefcc 100644 --- a/link_homework/internal/cmd/cmd.go +++ b/link_homework/internal/cmd/cmd.go @@ -6,6 +6,7 @@ import ( "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/os/gcmd" + "link_homework/internal/controller/homework" ) var ( @@ -25,7 +26,7 @@ var ( //// 设置登录前执行的函数,在用户登录之前会调用这个函数进行一些预处理，比如验证用户名和密码等。 //LoginBeforeFunc: loginFunc, //手动编写 没有同时配置登入路径,登入方法,登出路径启动时会报错 // 设置登出路径,即用户登出接口登入成功后会删除Token - LogoutPath: "/user/logout", + LogoutPath: "/logout", //// 设置需要拦截的路径，按照前缀拦截，所有以/user或/system开头的路径都需要进行Token认证。 //AuthPaths: g.SliceStr{"/user", "/system"}, //// 设置不需要拦截的路径，所有以/user/info或/system/user/开头的路径都不需要进行Token认证。 @@ -37,6 +38,7 @@ var ( //group.Middleware(middleware.MiddlewareIsLogin) gfToken.Middleware(ctx, group) //直接写接口,不用再分组 + group.POST("/get-homework-list", homework.Homework().GetHomeworkList) }) //客户端 s.Group("/api/homework_client", func(group *ghttp.RouterGroup) { diff --git a/link_homework/internal/controller/clientPage/clientPage.go b/link_homework/internal/controller/clientPage/clientPage.go deleted file mode 100644 index b3d594f..0000000 --- a/link_homework/internal/controller/clientPage/clientPage.go +++ /dev/null @@ -1 +0,0 @@ -package clientPage diff --git a/link_homework/internal/controller/homework/homework.go b/link_homework/internal/controller/homework/homework.go new file mode 100644 index 0000000..3d3c2d5 --- /dev/null +++ b/link_homework/internal/controller/homework/homework.go @@ -0,0 +1,25 @@ +package homework + +import ( + "github.com/gogf/gf/v2/net/ghttp" + "link_homework/api/v1/homework" + "link_homework/internal/service" +) + +type cHomework struct{} + +func Homework() *cHomework { + return &cHomework{} +} + +func (c cHomework) GetHomeworkList(r *ghttp.Request) { + var req *homework.GetHomeworkListReq + if err := r.Parse(&req); err != nil { + + } + res, err := service.Homework().GetHomeworkList(r.Context(), req) + if err != nil { + + } + r.Response.WriteJson(res) +} diff --git a/link_homework/internal/logic/homework/homework.go b/link_homework/internal/logic/homework/homework.go new file mode 100644 index 0000000..6661823 --- /dev/null +++ b/link_homework/internal/logic/homework/homework.go @@ -0,0 +1,24 @@ +package homework + +import ( + "context" + "link_homework/api/v1/homework" + "link_homework/internal/model/entity" + "link_homework/internal/service" +) + +type ( + sHomework struct{} +) + +func init() { + service.RegisterHomework(New()) +} + +func New() service.IHomework { + return &sHomework{} +} + +func (s *sHomework) GetHomeworkList(ctx context.Context, req *homework.GetHomeworkListReq) (homeworkList []*entity.ActivityInteractiveGroup, err error) { + return +} diff --git a/link_homework/internal/model/entity/activity_interactive_group.go b/link_homework/internal/model/entity/activity_interactive_group.go index fb7855f..4710938 100644 --- a/link_homework/internal/model/entity/activity_interactive_group.go +++ b/link_homework/internal/model/entity/activity_interactive_group.go @@ -14,10 +14,13 @@ type ActivityInteractiveGroup struct { Name string `json:"name" orm:"name" description:"表单名称"` // 表单名称 Status uint `json:"status" orm:"status" description:"表单状态 0 未发布 1 发布中 2 过期"` // 表单状态 0 未发布 1 发布中 2 过期 CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"` // 创建时间 - UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:""` // + UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:"更新时间"` // ClubType int `json:"clubType" orm:"club_type" description:"1:牧民俱乐部 2:博股论坛 3:神枪手俱乐部 4:环球俱乐部 5:价值投资 6:波段行情 7:抄底卖顶 8:资金及仓位管理 9 财富的游戏"` // 1:牧民俱乐部 2:博股论坛 3:神枪手俱乐部 4:环球俱乐部 5:价值投资 6:波段行情 7:抄底卖顶 8:资金及仓位管理 9 财富的游戏 ArticleId int `json:"articleId" orm:"article_id" description:"关联文章id"` // 关联文章id LiveId int `json:"liveId" orm:"live_id" description:"关联直播id"` // 关联直播id StartDate *gtime.Time `json:"startDate" orm:"start_date" description:"作业开始时间"` // 作业开始时间 EndDate *gtime.Time `json:"endDate" orm:"end_date" description:"作业结束时间"` // 作业结束时间 + Article *FxArticle `json:"article" orm:"with:id=article_id" description:"关联文章"` // 关联文章 + Live *Live `json:"live" orm:"with:id=live_id" description:"关联直播"` // 关联直播 + Count int `json:"count" description:"作业提交次数"` } diff --git a/link_homework/internal/service/homework.go b/link_homework/internal/service/homework.go new file mode 100644 index 0000000..fc3e0ff --- /dev/null +++ b/link_homework/internal/service/homework.go @@ -0,0 +1,33 @@ +// ================================================================================ +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. +// You can delete these comments if you wish manually maintain this interface file. +// ================================================================================ + +package service + +import ( + "context" + "link_homework/api/v1/homework" + "link_homework/internal/model/entity" +) + +type ( + IHomework interface { + GetHomeworkList(ctx context.Context, req *homework.GetHomeworkListReq) (homeworkList []*entity.ActivityInteractiveGroup, err error) + } +) + +var ( + localHomework IHomework +) + +func Homework() IHomework { + if localHomework == nil { + panic("implement not found for interface IHomework, forgot register?") + } + return localHomework +} + +func RegisterHomework(i IHomework) { + localHomework = i +} diff --git a/link_homework/internal/service/middleware.go b/link_homework/internal/service/middleware.go new file mode 100644 index 0000000..3d70438 --- /dev/null +++ b/link_homework/internal/service/middleware.go @@ -0,0 +1,8 @@ +// ================================================================================ +// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. +// You can delete these comments if you wish manually maintain this interface file. +// ================================================================================ + +package service + +type ()