发布v2.8.4版本，更新内容请查看：https://github.com/bufanyun/hotgo/tree/v2.0/docs/guide-zh-CN/addon-version-upgrade.md

server/internal/controller/admin/common/ems.go

@@ -23,7 +23,7 @@ type cEms struct{}
 
 // SendTest 发送测试邮件
 func (c *cEms) SendTest(ctx context.Context, req *common.SendTestEmailReq) (res *common.SendTestEmailRes, err error) {
-	err = service.SysEmsLog().Send(ctx, sysin.SendEmsInp{
+	err = service.SysEmsLog().Send(ctx, &sysin.SendEmsInp{
 		Event: consts.EmsTemplateText,
 		Email: req.To,
 		Content: `
@@ -47,16 +47,13 @@ func (c *cSms) SendBindEms(ctx context.Context, _ *common.SendBindEmsReq) (res *
 		memberId = contexts.GetUserId(ctx)
 		models   *entity.AdminMember
 	)
+
 	if memberId <= 0 {
 		err = gerror.New("用户身份异常，请重新登录！")
 		return
 	}
 
-	err = g.Model("admin_member").
-		Fields("email").
-		Where("id", memberId).
-		Scan(&models)
-	if err != nil {
+	if err = g.Model("admin_member").Fields("email").Where("id", memberId).Scan(&models); err != nil {
 		return
 	}
 
@@ -70,7 +67,7 @@ func (c *cSms) SendBindEms(ctx context.Context, _ *common.SendBindEmsReq) (res *
 		return
 	}
 
-	err = service.SysEmsLog().Send(ctx, sysin.SendEmsInp{
+	err = service.SysEmsLog().Send(ctx, &sysin.SendEmsInp{
 		Event: consts.EmsTemplateBind,
 		Email: models.Email,
 	})

server/internal/controller/admin/common/site.go

@@ -15,7 +15,6 @@ import (
 	"hotgo/internal/consts"
 	"hotgo/internal/library/captcha"
 	"hotgo/internal/library/token"
-	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
 	"hotgo/utility/validate"
 )
@@ -51,7 +50,6 @@ func (c *cSite) getWsAddr(ctx context.Context, request *ghttp.Request) string {
 	if err != nil || basic == nil {
 		return ""
 	}
-
 	return basic.WsAddr
 }
 
@@ -66,7 +64,6 @@ func (c *cSite) getDomain(ctx context.Context, request *ghttp.Request) string {
 	if err != nil || basic == nil {
 		return ""
 	}
-
 	return basic.Domain
 }
 
@@ -91,26 +88,12 @@ func (c *cSite) Captcha(ctx context.Context, _ *common.LoginCaptchaReq) (res *co
 
 // Register 账号注册
 func (c *cSite) Register(ctx context.Context, req *common.RegisterReq) (res *common.RegisterRes, err error) {
-	var in adminin.RegisterInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.AdminSite().Register(ctx, in)
+	err = service.AdminSite().Register(ctx, &req.RegisterInp)
 	return
 }
 
 // AccountLogin 账号登录
 func (c *cSite) AccountLogin(ctx context.Context, req *common.AccountLoginReq) (res *common.AccountLoginRes, err error) {
-	var in adminin.AccountLoginInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
 	login, err := service.SysConfig().GetLogin(ctx)
 	if err != nil {
 		return
@@ -124,7 +107,7 @@ func (c *cSite) AccountLogin(ctx context.Context, req *common.AccountLoginReq) (
 		}
 	}
 
-	model, err := service.AdminSite().AccountLogin(ctx, in)
+	model, err := service.AdminSite().AccountLogin(ctx, &req.AccountLoginInp)
 	if err != nil {
 		return
 	}
@@ -135,12 +118,7 @@ func (c *cSite) AccountLogin(ctx context.Context, req *common.AccountLoginReq) (
 
 // MobileLogin 手机号登录
 func (c *cSite) MobileLogin(ctx context.Context, req *common.MobileLoginReq) (res *common.MobileLoginRes, err error) {
-	var in adminin.MobileLoginInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	model, err := service.AdminSite().MobileLogin(ctx, in)
+	model, err := service.AdminSite().MobileLogin(ctx, &req.MobileLoginInp)
 	if err != nil {
 		return
 	}

server/internal/controller/admin/common/sms.go

@@ -9,14 +9,12 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/common"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 var Sms = new(cSms)
@@ -25,16 +23,7 @@ type cSms struct{}
 
 // SendTest 发送测试短信
 func (c *cSms) SendTest(ctx context.Context, req *common.SendTestSmsReq) (res *common.SendTestSmsRes, err error) {
-	var in sysin.SendCodeInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.SysSmsLog().SendCode(ctx, in)
+	err = service.SysSmsLog().SendCode(ctx, &req.SendCodeInp)
 	return
 }
 
@@ -50,11 +39,7 @@ func (c *cSms) SendBindSms(ctx context.Context, _ *common.SendBindSmsReq) (res *
 		return
 	}
 
-	err = g.Model("admin_member").
-		Fields("mobile").
-		Where("id", memberId).
-		Scan(&models)
-	if err != nil {
+	if err = g.Model("admin_member").Fields("mobile").Where("id", memberId).Scan(&models); err != nil {
 		return
 	}
 
@@ -68,7 +53,7 @@ func (c *cSms) SendBindSms(ctx context.Context, _ *common.SendBindSmsReq) (res *
 		return
 	}
 
-	err = service.SysSmsLog().SendCode(ctx, sysin.SendCodeInp{
+	err = service.SysSmsLog().SendCode(ctx, &sysin.SendCodeInp{
 		Event:  consts.SmsTemplateBind,
 		Mobile: models.Mobile,
 	})
@@ -77,15 +62,6 @@ func (c *cSms) SendBindSms(ctx context.Context, _ *common.SendBindSmsReq) (res *
 
 // SendSms 发送短信
 func (c *cSms) SendSms(ctx context.Context, req *common.SendSmsReq) (res *common.SendSmsRes, err error) {
-	var in sysin.SendCodeInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	err = service.SysSmsLog().SendCode(ctx, in)
+	err = service.SysSmsLog().SendCode(ctx, &req.SendCodeInp)
 	return
 }

server/internal/controller/admin/common/upload.go

@@ -10,29 +10,28 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"hotgo/api/admin/common"
+	"hotgo/internal/library/storager"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )
 
 var Upload = new(cUpload)
 
 type cUpload struct{}
 
-// UploadImage 上传图片
-func (c *cUpload) UploadImage(ctx context.Context, _ *common.UploadImageReq) (res common.UploadImageRes, err error) {
-	file := g.RequestFromCtx(ctx).GetUploadFile("file")
-	if file == nil {
-		err = gerror.New("没有找到上传的文件")
-		return
-	}
-	return service.CommonUpload().UploadImage(ctx, file)
-}
-
-// UploadFile 上传附件
+// UploadFile 上传文件
 func (c *cUpload) UploadFile(ctx context.Context, _ *common.UploadFileReq) (res common.UploadFileRes, err error) {
-	file := g.RequestFromCtx(ctx).GetUploadFile("file")
+	r := g.RequestFromCtx(ctx)
+	uploadType := r.Header.Get("uploadType")
+	if uploadType != "default" && !validate.InSlice(storager.KindSlice, uploadType) {
+		err = gerror.New("上传类型是无效的")
+		return
+	}
+
+	file := r.GetUploadFile("file")
 	if file == nil {
 		err = gerror.New("没有找到上传的文件")
 		return
 	}
-	return service.CommonUpload().UploadFile(ctx, file)
+	return service.CommonUpload().UploadFile(ctx, uploadType, file)
 }

server/internal/controller/admin/common/wechat.go

@@ -7,11 +7,8 @@ package common
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/admin/common"
-	"hotgo/internal/model/input/commonin"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 var (
@@ -21,29 +18,11 @@ var (
 type cWechat struct{}
 
 func (c *cWechat) Authorize(ctx context.Context, req *common.WechatAuthorizeReq) (res *common.WechatAuthorizeRes, err error) {
-	var in commonin.WechatAuthorizeInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	_, err = service.CommonWechat().Authorize(ctx, in)
+	_, err = service.CommonWechat().Authorize(ctx, &req.WechatAuthorizeInp)
 	return
 }
 
 func (c *cWechat) AuthorizeCall(ctx context.Context, req *common.WechatAuthorizeCallReq) (res *common.WechatAuthorizeCallRes, err error) {
-	var in commonin.WechatAuthorizeCallInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	if err = validate.PreFilter(ctx, &in); err != nil {
-		return
-	}
-
-	_, err = service.CommonWechat().AuthorizeCall(ctx, in)
+	_, err = service.CommonWechat().AuthorizeCall(ctx, &req.WechatAuthorizeCallInp)
 	return
 }