This commit is contained in:
孟帅
2025-07-13 18:57:52 +08:00
parent 20a9e38fa8
commit 42d5500941
23 changed files with 91 additions and 27 deletions

View File

@@ -57,4 +57,5 @@ var HTTPHandlerTimeOptions = []*model.Option{
var HTTPApiCodeOptions = []*model.Option{
dict.GenSuccessOption(gcode.CodeOK.Code(), fmt.Sprintf("%v %v", gcode.CodeOK.Code(), "成功")),
dict.GenWarningOption(gcode.CodeNil.Code(), fmt.Sprintf("%v %v", gcode.CodeNil.Code(), "失败")),
dict.GenWarningOption(gcode.CodeSecurityReason.Code(), fmt.Sprintf("%v %v", gcode.CodeSecurityReason.Code(), "无访问权限")),
}

View File

@@ -7,5 +7,5 @@ package consts
// VersionApp HotGo版本
const (
VersionApp = "2.16.10"
VersionApp = "2.17.8"
)

View File

@@ -46,9 +46,13 @@ func Sorter(in ISorter) func(m *gdb.Model) *gdb.Model {
var sorter2 []*form.Sorter
for k, sorter := range sorters {
if gstr.HasPrefix(sorter.ColumnKey, as) {
as2 := as
if gstr.Contains(sorter.ColumnKey, `.`) {
as2 += "."
}
if gstr.HasPrefix(sorter.ColumnKey, as2) {
sorter2 = append(sorter2, &form.Sorter{
ColumnKey: gstr.Replace(sorter.ColumnKey, as, ""),
ColumnKey: gstr.Replace(sorter.ColumnKey, as2, ""),
Order: sorter.Order,
})
removeIndex = append(removeIndex, k)

View File

@@ -757,7 +757,8 @@ func (s *sAdminMember) GetIdByCode(ctx context.Context, in *adminin.GetIdByCodeI
// Select 获取可选的用户选项
func (s *sAdminMember) Select(ctx context.Context, in *adminin.MemberSelectInp) (res []*adminin.MemberSelectModel, err error) {
err = dao.AdminMember.Ctx(ctx).Fields(fmt.Printf("%s as value,%s as label,%s,%s", dao.AdminMember.Columns().Id, dao.AdminMember.Columns().RealName, dao.AdminMember.Columns().Username, dao.AdminMember.Columns().Avatar)).
fields := fmt.Sprintf("%s as value,%s as label,%s,%s", dao.AdminMember.Columns().Id, dao.AdminMember.Columns().RealName, dao.AdminMember.Columns().Username, dao.AdminMember.Columns().Avatar)
err = dao.AdminMember.Ctx(ctx).Fields(fields).
Handler(handler.FilterAuthWithField("id")).
Scan(&res)
if err != nil {

View File

@@ -119,7 +119,11 @@ func (s *sSysEmsLog) List(ctx context.Context, in *sysin.EmsLogListInp) (list []
// Send 发送邮件
func (s *sSysEmsLog) Send(ctx context.Context, in *sysin.SendEmsInp) (err error) {
var models *entity.SysEmsLog
if err = dao.SysEmsLog.Ctx(ctx).Where("event", in.Event).Where("email", in.Email).Scan(&models); err != nil {
if err = dao.SysEmsLog.Ctx(ctx).
Where("event", in.Event).
Where("email", in.Email).
OrderDesc(dao.SysEmsLog.Columns().Id).
Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
@@ -239,7 +243,7 @@ func (s *sSysEmsLog) newView(ctx context.Context, in *sysin.SendEmsInp, config *
basic = new(model.BasicConfig)
basic.Name = simple.AppName(ctx)
basic.Domain = "https://hotgo.facms.cn"
basic.Logo = "http://bufanyun.cn-bj.ufileos.com/haoka/attachment/images/2023-02-04/cq9kf7s66jt7hkpvbh.png"
basic.Logo = "https://gmycos.facms.cn/haoka/attachment/images/2023-02-04/cq9kf7s66jt7hkpvbh.png"
basic.SystemOpen = true
}
@@ -380,7 +384,11 @@ func (s *sSysEmsLog) VerifyCode(ctx context.Context, in *sysin.VerifyEmsCodeInp)
}
var models *entity.SysEmsLog
if err = dao.SysEmsLog.Ctx(ctx).Where(dao.SysEmsLog.Columns().Event, in.Event).Where(dao.SysEmsLog.Columns().Email, in.Email).Order(dao.SysEmsLog.Columns().Id, false).Scan(&models); err != nil {
if err = dao.SysEmsLog.Ctx(ctx).
Where(dao.SysEmsLog.Columns().Event, in.Event).
Where(dao.SysEmsLog.Columns().Email, in.Email).
OrderDesc(dao.SysEmsLog.Columns().Id).
Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}

View File

@@ -103,7 +103,11 @@ func (s *sSysSmsLog) SendCode(ctx context.Context, in *sysin.SendCodeInp) (err e
}
var models *entity.SysSmsLog
if err = dao.SysSmsLog.Ctx(ctx).Where(dao.SysSmsLog.Columns().Event, in.Event).Where(dao.SysSmsLog.Columns().Mobile, in.Mobile).Scan(&models); err != nil {
if err = dao.SysSmsLog.Ctx(ctx).
Where(dao.SysSmsLog.Columns().Event, in.Event).
Where(dao.SysSmsLog.Columns().Mobile, in.Mobile).
OrderDesc(dao.SysSmsLog.Columns().Id).
Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}

File diff suppressed because one or more lines are too long