public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-05-06 12:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化]base模块提出

Browse Source
This commit is contained in:
PandaGoAdmin
2022-08-02 22:37:37 +08:00
parent 0555922a90
commit 2cb23c0ecf
151 changed files with 550 additions and 5255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/resource/api/email.go
View File

@@ -1,13 +1,13 @@
package api
import (
"github.com/XM-GO/PandaKit/biz"
email "github.com/XM-GO/PandaKit/mail"
"github.com/XM-GO/PandaKit/restfulx"
"github.com/XM-GO/PandaKit/utils"
"pandax/apps/resource/api/from"
"pandax/apps/resource/entity"
"pandax/apps/resource/services"
"pandax/base/biz"
"pandax/base/ginx"
email "pandax/base/mail"
"pandax/base/utils"
)
/**
@@ -29,10 +29,10 @@ type ResEmailsApi struct {
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /resource/email/list [get]
// @Security
func (p *ResEmailsApi) GetResEmailsList(rc *ginx.ReqCtx) {
func (p *ResEmailsApi) GetResEmailsList(rc *restfulx.ReqCtx) {
pageNum := ginx.QueryInt(rc.GinCtx, "pageNum", 1)
pageSize := ginx.QueryInt(rc.GinCtx, "pageSize", 10)
pageNum := restfulx.QueryInt(rc.GinCtx, "pageNum", 1)
pageSize := restfulx.QueryInt(rc.GinCtx, "pageSize", 10)
status := rc.GinCtx.Query("status")
category := rc.GinCtx.Query("category")
@@ -59,8 +59,8 @@ func (p *ResEmailsApi) GetResEmailsList(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /resource/email/{mailId} [get]
// @Security
func (p *ResEmailsApi) GetResEmails(rc *ginx.ReqCtx) {
mailId := ginx.PathParamInt(rc.GinCtx, "mailId")
func (p *ResEmailsApi) GetResEmails(rc *restfulx.ReqCtx) {
mailId := restfulx.PathParamInt(rc.GinCtx, "mailId")
p.ResEmailsApp.FindOne(int64(mailId))
}
@@ -74,9 +74,9 @@ func (p *ResEmailsApi) GetResEmails(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /resource/email [post]
// @Security X-TOKEN
func (p *ResEmailsApi) InsertResEmails(rc *ginx.ReqCtx) {
func (p *ResEmailsApi) InsertResEmails(rc *restfulx.ReqCtx) {
var data entity.ResEmail
ginx.BindJsonAndValid(rc.GinCtx, &data)
restfulx.BindJsonAndValid(rc.GinCtx, &data)
p.ResEmailsApp.Insert(data)
}
@@ -91,9 +91,9 @@ func (p *ResEmailsApi) InsertResEmails(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /resource/email [put]
// @Security X-TOKEN
func (p *ResEmailsApi) UpdateResEmails(rc *ginx.ReqCtx) {
func (p *ResEmailsApi) UpdateResEmails(rc *restfulx.ReqCtx) {
var data entity.ResEmail
ginx.BindJsonAndValid(rc.GinCtx, &data)
restfulx.BindJsonAndValid(rc.GinCtx, &data)
if utils.ISDdmMail(data.From) {
data.From = ""
}
@@ -110,7 +110,7 @@ func (p *ResEmailsApi) UpdateResEmails(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /resource/email/{mailId} [delete]
func (p *ResEmailsApi) DeleteResEmails(rc *ginx.ReqCtx) {
func (p *ResEmailsApi) DeleteResEmails(rc *restfulx.ReqCtx) {
mailId := rc.GinCtx.Param("mailId")
mailIds := utils.IdsStrToIdsIntGroup(mailId)
@@ -127,9 +127,9 @@ func (p *ResEmailsApi) DeleteResEmails(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /resource/oss [put]
// @Security X-TOKEN
func (p *ResEmailsApi) UpdateMailStatus(rc *ginx.ReqCtx) {
func (p *ResEmailsApi) UpdateMailStatus(rc *restfulx.ReqCtx) {
var data entity.ResEmail
ginx.BindJsonAndValid(rc.GinCtx, &data)
restfulx.BindJsonAndValid(rc.GinCtx, &data)
p.ResEmailsApp.Update(entity.ResEmail{MailId: data.MailId, Status: data.Status})
}
@@ -144,9 +144,9 @@ func (p *ResEmailsApi) UpdateMailStatus(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /resource/email/debugMail [post]
// @Security X-TOKEN
func (p *ResEmailsApi) DebugMail(rc *ginx.ReqCtx) {
func (p *ResEmailsApi) DebugMail(rc *restfulx.ReqCtx) {
var data from.SendMail
ginx.BindJsonAndValid(rc.GinCtx, &data)
restfulx.BindJsonAndValid(rc.GinCtx, &data)
one := p.ResEmailsApp.FindOne(data.MailId)
ml := email.Mail{

34
apps/resource/api/oss.go
View File

@@ -2,12 +2,12 @@ package api
import (
"fmt"
"github.com/XM-GO/PandaKit/biz"
"github.com/XM-GO/PandaKit/oss"
"github.com/XM-GO/PandaKit/restfulx"
"github.com/XM-GO/PandaKit/utils"
"pandax/apps/resource/entity"
"pandax/apps/resource/services"
"pandax/base/biz"
"pandax/base/ginx"
"pandax/base/oss"
"pandax/base/utils"
"time"
)
@@ -31,10 +31,10 @@ type ResOssesApi struct {
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /resource/oss/list [get]
// @Security
func (p *ResOssesApi) GetResOssesList(rc *ginx.ReqCtx) {
func (p *ResOssesApi) GetResOssesList(rc *restfulx.ReqCtx) {
pageNum := ginx.QueryInt(rc.GinCtx, "pageNum", 1)
pageSize := ginx.QueryInt(rc.GinCtx, "pageSize", 10)
pageNum := restfulx.QueryInt(rc.GinCtx, "pageNum", 1)
pageSize := restfulx.QueryInt(rc.GinCtx, "pageSize", 10)
status := rc.GinCtx.Query("status")
category := rc.GinCtx.Query("category")
ossCode := rc.GinCtx.Query("ossCode")
@@ -62,8 +62,8 @@ func (p *ResOssesApi) GetResOssesList(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /resource/oss/{ossId} [get]
// @Security
func (p *ResOssesApi) GetResOsses(rc *ginx.ReqCtx) {
ossId := ginx.PathParamInt(rc.GinCtx, "ossId")
func (p *ResOssesApi) GetResOsses(rc *restfulx.ReqCtx) {
ossId := restfulx.PathParamInt(rc.GinCtx, "ossId")
p.ResOssesApp.FindOne(int64(ossId))
}
@@ -77,9 +77,9 @@ func (p *ResOssesApi) GetResOsses(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /resource/oss [post]
// @Security X-TOKEN
func (p *ResOssesApi) InsertResOsses(rc *ginx.ReqCtx) {
func (p *ResOssesApi) InsertResOsses(rc *restfulx.ReqCtx) {
var data entity.ResOss
ginx.BindJsonAndValid(rc.GinCtx, &data)
restfulx.BindJsonAndValid(rc.GinCtx, &data)
p.ResOssesApp.Insert(data)
}
@@ -94,9 +94,9 @@ func (p *ResOssesApi) InsertResOsses(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /resource/oss [put]
// @Security X-TOKEN
func (p *ResOssesApi) UpdateResOsses(rc *ginx.ReqCtx) {
func (p *ResOssesApi) UpdateResOsses(rc *restfulx.ReqCtx) {
var data entity.ResOss
ginx.BindJsonAndValid(rc.GinCtx, &data)
restfulx.BindJsonAndValid(rc.GinCtx, &data)
if utils.IsDdmKey(data.AccessKey) {
data.AccessKey = ""
}
@@ -113,7 +113,7 @@ func (p *ResOssesApi) UpdateResOsses(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /resource/oss/{ossId} [delete]
func (p *ResOssesApi) DeleteResOsses(rc *ginx.ReqCtx) {
func (p *ResOssesApi) DeleteResOsses(rc *restfulx.ReqCtx) {
ossId := rc.GinCtx.Param("ossId")
ossIds := utils.IdsStrToIdsIntGroup(ossId)
@@ -126,7 +126,7 @@ func (p *ResOssesApi) DeleteResOsses(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /resource/oss/uploadFile [post]
func (p *ResOssesApi) UplaodResOsses(rc *ginx.ReqCtx) {
func (p *ResOssesApi) UplaodResOsses(rc *restfulx.ReqCtx) {
file, _ := rc.GinCtx.FormFile("file")
ossCode, _ := rc.GinCtx.GetQuery("ossCode")
list := p.ResOssesApp.FindList(entity.ResOss{OssCode: ossCode})
@@ -150,9 +150,9 @@ func (p *ResOssesApi) UplaodResOsses(rc *ginx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /resource/oss [put]
// @Security X-TOKEN
func (p *ResOssesApi) UpdateOssStatus(rc *ginx.ReqCtx) {
func (p *ResOssesApi) UpdateOssStatus(rc *restfulx.ReqCtx) {
var data entity.ResOss
ginx.BindJsonAndValid(rc.GinCtx, &data)
restfulx.BindJsonAndValid(rc.GinCtx, &data)
p.ResOssesApp.Update(entity.ResOss{OssId: data.OssId, Status: data.Status})
}

2
apps/resource/entity/mail.go
View File

@@ -1,6 +1,6 @@
package entity
import "pandax/base/model"
import "github.com/XM-GO/PandaKit/model"
/**
* @Description 添加qq群467890197 交流学习

2
apps/resource/entity/oss.go
View File

@@ -1,6 +1,6 @@
package entity
import "pandax/base/model"
import "github.com/XM-GO/PandaKit/model"
/**
* @Description 添加qq群467890197 交流学习

16
apps/resource/router/email.go
View File

@@ -1,10 +1,10 @@
package router
import (
"github.com/XM-GO/PandaKit/restfulx"
"github.com/gin-gonic/gin"
"pandax/apps/resource/api"
"pandax/apps/resource/services"
"pandax/base/ginx"
)
/**
@@ -20,30 +20,30 @@ func InitResEmailsRouter(router *gin.RouterGroup) {
routerGroup := router.Group("email")
routerGroup.GET("list", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("获取ResEmails分页列表").Handle(s.GetResEmailsList)
restfulx.NewReqCtx(c).WithLog("获取ResEmails分页列表").Handle(s.GetResEmailsList)
})
routerGroup.GET(":mailId", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("获取ResEmails信息").Handle(s.GetResEmails)
restfulx.NewReqCtx(c).WithLog("获取ResEmails信息").Handle(s.GetResEmails)
})
routerGroup.POST("", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("添加ResEmails信息").Handle(s.InsertResEmails)
restfulx.NewReqCtx(c).WithLog("添加ResEmails信息").Handle(s.InsertResEmails)
})
routerGroup.PUT("", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("修改ResEmails信息").Handle(s.UpdateResEmails)
restfulx.NewReqCtx(c).WithLog("修改ResEmails信息").Handle(s.UpdateResEmails)
})
routerGroup.DELETE(":mailId", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("删除ResEmails信息").Handle(s.DeleteResEmails)
restfulx.NewReqCtx(c).WithLog("删除ResEmails信息").Handle(s.DeleteResEmails)
})
routerGroup.PUT("changeStatus", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("修改状态").Handle(s.UpdateMailStatus)
restfulx.NewReqCtx(c).WithLog("修改状态").Handle(s.UpdateMailStatus)
})
routerGroup.POST("debugMail", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("修改状态").Handle(s.DebugMail)
restfulx.NewReqCtx(c).WithLog("修改状态").Handle(s.DebugMail)
})
}

16
apps/resource/router/oss.go
View File

@@ -1,10 +1,10 @@
package router
import (
"github.com/XM-GO/PandaKit/restfulx"
"github.com/gin-gonic/gin"
"pandax/apps/resource/api"
"pandax/apps/resource/services"
"pandax/base/ginx"
)
/**
@@ -20,30 +20,30 @@ func InitResOssRouter(router *gin.RouterGroup) {
routerGroup := router.Group("oss")
routerGroup.GET("list", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("获取ResOsses分页列表").Handle(s.GetResOssesList)
restfulx.NewReqCtx(c).WithLog("获取ResOsses分页列表").Handle(s.GetResOssesList)
})
routerGroup.GET(":ossId", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("获取ResOsses信息").Handle(s.GetResOsses)
restfulx.NewReqCtx(c).WithLog("获取ResOsses信息").Handle(s.GetResOsses)
})
routerGroup.POST("", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("添加ResOsses信息").Handle(s.InsertResOsses)
restfulx.NewReqCtx(c).WithLog("添加ResOsses信息").Handle(s.InsertResOsses)
})
routerGroup.PUT("", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("修改ResOsses信息").Handle(s.UpdateResOsses)
restfulx.NewReqCtx(c).WithLog("修改ResOsses信息").Handle(s.UpdateResOsses)
})
routerGroup.DELETE(":ossId", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("删除ResOsses信息").Handle(s.DeleteResOsses)
restfulx.NewReqCtx(c).WithLog("删除ResOsses信息").Handle(s.DeleteResOsses)
})
routerGroup.POST("uploadFile", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("测试文件上传").Handle(s.UplaodResOsses)
restfulx.NewReqCtx(c).WithLog("测试文件上传").Handle(s.UplaodResOsses)
})
routerGroup.PUT("/changeStatus", func(c *gin.Context) {
ginx.NewReqCtx(c).WithLog("修改状态").Handle(s.UpdateOssStatus)
restfulx.NewReqCtx(c).WithLog("修改状态").Handle(s.UpdateOssStatus)
})
}

2
apps/resource/services/email.go
View File

@@ -1,8 +1,8 @@
package services
import (
"github.com/XM-GO/PandaKit/biz"
"pandax/apps/resource/entity"
"pandax/base/biz"
"pandax/pkg/global"
)

2
apps/resource/services/oss.go
View File

@@ -1,8 +1,8 @@
package services
import (
"github.com/XM-GO/PandaKit/biz"
"pandax/apps/resource/entity"
"pandax/base/biz"
"pandax/pkg/global"
)