github_mirrors/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-08-28 10:09:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

发布v2.5.3版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

Browse Source
This commit is contained in:
孟帅
2023-05-10 23:54:50 +08:00
parent bbe655a4d8
commit 49a96750bf
314 changed files with 15138 additions and 6244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

286
server/internal/logic/admin/cash.go Normal file
View File

@@ -0,0 +1,286 @@
// Package admin
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
package admin
import (
"context"
"fmt"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/contexts"
"hotgo/internal/library/location"
"hotgo/internal/model"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/adminin"
"hotgo/internal/model/input/sysin"
"hotgo/internal/service"
)
type sAdminCash struct{}
func NewAdminCash() *sAdminCash {
return &sAdminCash{}
}
func init() {
service.RegisterAdminCash(NewAdminCash())
}
// View 获取指定字典类型信息
func (s *sAdminCash) View(ctx context.Context, in adminin.CashViewInp) (res *adminin.CashViewModel, err error) {
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
err = gerror.New("没有访问权限")
return
}
if err = dao.AdminCash.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if res == nil {
err = gerror.New("提现信息获取失败")
return
}
var mem *entity.AdminMember
err = dao.AdminMember.Ctx(ctx).Where("id", res.MemberId).Scan(&mem)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if !mem.Cash.IsNil() {
if err = mem.Cash.Scan(&res.MemberCash); err != nil {
return
}
}
return
}
// List 获取列表
func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*adminin.CashListModel, totalCount int, err error) {
var (
mod = dao.AdminCash.Ctx(ctx)
opMemberId = contexts.GetUserId(ctx)
isSuper = service.AdminMember().VerifySuperId(ctx, opMemberId)
)
if in.MemberId > 0 {
mod = mod.Where("member_id", in.MemberId)
}
if len(in.CreatedAt) == 2 {
mod = mod.WhereBetween("created_at", gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
}
// 请求方式
if in.Status > 0 {
mod = mod.Where("status", in.Status)
}
if !isSuper {
mod = mod.Where("member_id", opMemberId)
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if totalCount == 0 {
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
for _, v := range list {
var member *entity.AdminMember
err = dao.AdminMember.Ctx(ctx).
Fields("real_name", "username").Where("id", v.MemberId).Scan(&member)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
if member != nil {
v.MemberName = member.RealName
v.MemberUser = member.Username
}
}
return
}
// Apply 申请提现
func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err error) {
var (
config *model.CashConfig
member *entity.AdminMember
)
if in.Money <= 0 {
err = gerror.New("请输入提现金额")
return
}
if in.Money != float64(int(in.Money)) {
err = gerror.New("提现金额必须是正整数")
return
}
count, err := dao.AdminCash.Ctx(ctx).
Where("member_id", in.MemberId).
Where("status", consts.StatusEnabled).
Count()
if err != nil {
return
}
if count > 0 {
err = gerror.New("存在正在处理中的提现，请耐心等待处理后再试！")
return
}
if err = dao.AdminMember.Ctx(ctx).Where("id", in.MemberId).Scan(&member); err != nil {
err = gerror.Newf("获取管理员信息失败:%+v", err.Error())
return
}
if member == nil {
err = gerror.Newf("获取管理员信息失败")
return
}
if member.Balance < in.Money {
err = gerror.Newf("余额不足")
return
}
// 提现信息
var cash adminin.MemberCash
if member.Cash.IsNil() {
err = gerror.Newf("请先设置提现账户！")
return
}
if err = gconv.Scan(member.Cash, &cash); err != nil {
return
}
if cash.Name == "" || cash.Account == "" || cash.PayeeCode == "" {
err = gerror.New("请设置完整的提现账户信息！")
return
}
conf, err := service.SysConfig().GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "cash"})
if err != nil {
return
}
if err = gconv.Struct(conf.List, &config); err != nil {
return err
}
if !config.Switch {
err = gerror.New("提现通道正在升级维护中，请稍后再试！")
return
}
if in.Money < config.MinMoney {
err = gerror.Newf("单次提现金额不能低于 %v 元", config.MinMoney)
return
}
fee := in.Money * config.MinFeeRatio
if fee < config.MinFee {
fee = config.MinFee
}
lastMoney := in.Money - fee
if lastMoney <= 1 {
err = gerror.Newf("提现金额过少，请增加提现金额！")
return
}
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 添加提现记录
lastInsertId, err := dao.AdminCash.Ctx(ctx).Data(g.Map{
"member_id": in.MemberId,
"money": in.Money,
"fee": fee,
"last_money": lastMoney,
"created_at": gtime.Now(),
"status": consts.CashStatusWait,
"msg": "",
"ip": location.GetClientIp(ghttp.RequestFromCtx(ctx)),
}).InsertAndGetId()
if err != nil {
return
}
// 更新余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
MemberId: in.MemberId,
AppId: contexts.GetModule(ctx),
AddonsName: contexts.GetAddonName(ctx),
CreditGroup: consts.CreditGroupApplyCash,
Num: -in.Money,
MapId: lastInsertId,
Remark: fmt.Sprintf("后台申请提现"),
})
return
})
if err != nil {
err = gerror.Newf("申请提现失败, %+v", err)
return
}
return
}
// Payment 提现打款处理
func (s *sAdminCash) Payment(ctx context.Context, in adminin.CashPaymentInp) (err error) {
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
err = gerror.New("没有访问权限")
return
}
var models *entity.AdminCash
if err = dao.AdminCash.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
return
}
if models == nil {
err = gerror.New("未找到提现信息")
return
}
if models.Status == consts.CashStatusOk {
err = gerror.New("该提现已处理成功，不能再次操作！")
return
}
_, err = dao.AdminCash.Ctx(ctx).Where("id", models.Id).Data(g.Map{
"handle_at": gtime.Now(),
"status": in.Status,
"msg": gstr.Trim(in.Msg, " "),
}).Update()
return
}

255
server/internal/logic/admin/credits_log.go Normal file
View File

@@ -0,0 +1,255 @@
// Package admin
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
// @AutoGenerate Version 2.5.3
// @AutoGenerate Date 2023-04-15 15:59:58
package admin
import (
"context"
"fmt"
"github.com/gogf/gf/v2/errors/gerror"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/hgorm"
"hotgo/internal/library/hgorm/handler"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/adminin"
"hotgo/internal/model/input/form"
"hotgo/internal/service"
"hotgo/utility/convert"
"hotgo/utility/excel"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/util/gconv"
)
type sAdminCreditsLog struct{}
func NewAdminCreditsLog() *sAdminCreditsLog {
return &sAdminCreditsLog{}
}
func init() {
service.RegisterAdminCreditsLog(NewAdminCreditsLog())
}
// Model 资产变动ORM模型
func (s *sAdminCreditsLog) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
return handler.Model(dao.AdminCreditsLog.Ctx(ctx), option...)
}
// SaveBalance 更新余额
func (s *sAdminCreditsLog) SaveBalance(ctx context.Context, in adminin.CreditsLogSaveBalanceInp) (res *adminin.CreditsLogSaveBalanceModel, err error) {
if err = in.Filter(ctx); err != nil {
return
}
var (
mb *entity.AdminMember
daoMember = dao.AdminMember.Ctx(ctx).Where(dao.AdminMember.Columns().Id, in.MemberId)
data = new(entity.AdminCreditsLog)
)
err = dao.AdminMember.Ctx(ctx).
Fields(dao.AdminMember.Columns().Balance).
Where(dao.AdminMember.Columns().Id, in.MemberId).
Scan(&mb)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if mb == nil {
err = gerror.New("用户不存在！")
return
}
if in.Num > 0 {
if _, err = daoMember.Increment(dao.AdminMember.Columns().Balance, in.Num); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
} else {
num := in.Num * -1
if mb.Balance < num {
err = gerror.Newf("余额不足，当前余额为：%v，需要扣除的余额为：%v", mb.Balance, num)
return
}
if _, err = daoMember.Decrement(dao.AdminMember.Columns().Balance, num); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
}
data.MemberId = in.MemberId
data.AppId = in.AppId
data.AddonsName = in.AddonsName
data.CreditType = consts.CreditTypeBalance
data.CreditGroup = in.CreditGroup
data.BeforeNum = mb.Balance
data.Num = in.Num
data.AfterNum = mb.Balance + in.Num
data.Remark = in.Remark
data.Ip = in.Ip
data.MapId = in.MapId
_, err = dao.AdminCreditsLog.Ctx(ctx).Data(data).Insert()
return
}
// SaveIntegral 更新积分
func (s *sAdminCreditsLog) SaveIntegral(ctx context.Context, in adminin.CreditsLogSaveIntegralInp) (res *adminin.CreditsLogSaveIntegralModel, err error) {
if err = in.Filter(ctx); err != nil {
return
}
var (
mb *entity.AdminMember
daoMember = dao.AdminMember.Ctx(ctx).Where(dao.AdminMember.Columns().Id, in.MemberId)
data = new(entity.AdminCreditsLog)
)
err = dao.AdminMember.Ctx(ctx).
Fields(dao.AdminMember.Columns().Integral).
Where(dao.AdminMember.Columns().Id, in.MemberId).
Scan(&mb)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if mb == nil {
err = gerror.New("用户不存在！")
return
}
if in.Num > 0 {
if _, err = daoMember.Increment(dao.AdminMember.Columns().Integral, in.Num); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
} else {
num := in.Num * -1
if mb.Integral < num {
err = gerror.Newf("积分不足，当前积分为：%v，需要扣除的积分为：%v", mb.Integral, num)
return
}
if _, err = daoMember.Decrement(dao.AdminMember.Columns().Integral, num); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
}
data.MemberId = in.MemberId
data.AppId = in.AppId
data.AddonsName = in.AddonsName
data.CreditType = consts.CreditTypeIntegral
data.CreditGroup = in.CreditGroup
data.BeforeNum = mb.Integral
data.Num = in.Num
data.AfterNum = mb.Integral + in.Num
data.Remark = in.Remark
data.Ip = in.Ip
data.MapId = in.MapId
_, err = dao.AdminCreditsLog.Ctx(ctx).Data(data).Insert()
return
}
// List 获取资产变动列表
func (s *sAdminCreditsLog) List(ctx context.Context, in adminin.CreditsLogListInp) (list []*adminin.CreditsLogListModel, totalCount int, err error) {
mod := s.Model(ctx)
// 查询变动ID
if in.Id > 0 {
mod = mod.Where(dao.AdminCreditsLog.Columns().Id, in.Id)
}
// 查询管理员ID
if in.MemberId > 0 {
mod = mod.Where(dao.AdminCreditsLog.Columns().MemberId, in.MemberId)
}
// 查询应用id
if in.AppId != "" {
mod = mod.WhereLike(dao.AdminCreditsLog.Columns().AppId, in.AppId)
}
// 查询变动类型
if in.CreditType != "" {
mod = mod.WhereLike(dao.AdminCreditsLog.Columns().CreditType, in.CreditType)
}
// 查询变动的组别
if in.CreditGroup != "" {
mod = mod.WhereLike(dao.AdminCreditsLog.Columns().CreditGroup, in.CreditGroup)
}
// 查询备注
if in.Remark != "" {
mod = mod.WhereLike(dao.AdminCreditsLog.Columns().Remark, "%"+in.Remark+"%")
}
// 查询操作人IP
if in.Ip != "" {
mod = mod.WhereLike(dao.AdminCreditsLog.Columns().Ip, in.Ip)
}
// 查询状态
if in.Status > 0 {
mod = mod.Where(dao.AdminCreditsLog.Columns().Status, in.Status)
}
// 查询创建时间
if len(in.CreatedAt) == 2 {
mod = mod.WhereBetween(dao.AdminCreditsLog.Columns().CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
}
totalCount, err = mod.Clone().Count(1)
if err != nil {
return
}
if totalCount == 0 {
return
}
fields, err := hgorm.GenSelect(ctx, adminin.CreditsLogListModel{}, dao.AdminCreditsLog)
if err != nil {
return
}
err = mod.Fields(fields).Page(in.Page, in.PerPage).OrderDesc(dao.AdminCreditsLog.Columns().Id).Scan(&list)
return
}
// Export 导出资产变动
func (s *sAdminCreditsLog) Export(ctx context.Context, in adminin.CreditsLogListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return
}
// 字段的排序是依据tags的字段顺序，如果你不想使用默认的排序方式，可以直接定义 tags = []string{"字段名称", "字段名称2", ...}
tags, err := convert.GetEntityDescTags(adminin.CreditsLogExportModel{})
if err != nil {
return
}
var (
fileName = "导出资产变动-" + gctx.CtxId(ctx) + ".xlsx"
sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
exports []adminin.CreditsLogExportModel
)
if err = gconv.Scan(list, &exports); err != nil {
return
}
err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
return
}

48
server/internal/logic/admin/dept.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package admin
import (
@@ -12,11 +11,14 @@ import (
"github.com/gogf/gf/v2/os/gtime"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/contexts"
"hotgo/internal/library/hgorm"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/adminin"
"hotgo/internal/model/input/form"
"hotgo/internal/service"
"hotgo/utility/convert"
"hotgo/utility/tree"
"hotgo/utility/validate"
)
@@ -123,7 +125,6 @@ func (s *sAdminDept) Status(ctx context.Context, in adminin.DeptStatusInp) (err
// MaxSort 最大排序
func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (res *adminin.DeptMaxSortModel, err error) {
res = new(adminin.DeptMaxSortModel)
if in.Id > 0 {
if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
@@ -131,7 +132,10 @@ func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (re
}
}
res.Sort = res.Sort + 10
if res == nil {
res = new(adminin.DeptMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
@@ -141,6 +145,36 @@ func (s *sAdminDept) View(ctx context.Context, in adminin.DeptViewInp) (res *adm
return
}
// Option 选项
func (s *sAdminDept) Option(ctx context.Context, in adminin.DeptOptionInp) (res *adminin.DeptOptionModel, totalCount int, err error) {
var (
mod = dao.AdminDept.Ctx(ctx)
models []*entity.AdminDept
pid int64 = 0
)
// 非超管只获取下级
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
pid = contexts.GetUser(ctx).DeptId
mod = mod.WhereLike(dao.AdminDept.Columns().Tree, "%"+tree.GetIdLabel(pid)+"%")
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if err = mod.Page(in.Page, in.PerPage).Order("sort asc,id asc").Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
res = new(adminin.DeptOptionModel)
res.List = s.treeList(pid, models)
return
}
// List 获取列表
func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adminin.DeptListModel, err error) {
var (
@@ -168,7 +202,8 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adm
}
if in.Code != "" {
values, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("code", "%"+in.Code+"%").Array()
values, err := dao.AdminDept.Ctx(ctx).Fields("pid").
WhereLike("code", "%"+in.Code+"%").Array()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
@@ -202,10 +237,7 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adm
// GetName 获取部门名称
func (s *sAdminDept) GetName(ctx context.Context, id int64) (name string, err error) {
var data entity.AdminDept
err = dao.AdminDept.Ctx(ctx).
Where("id", id).
Fields("name").
Scan(&data)
err = dao.AdminDept.Ctx(ctx).Where("id", id).Fields("name").Scan(&data)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return name, err

377
server/internal/logic/admin/member.go
View File

@@ -3,11 +3,11 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package admin
import (
"context"
"fmt"
"github.com/gogf/gf/v2/crypto/gmd5"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gerror"
@@ -43,6 +43,98 @@ func init() {
service.RegisterAdminMember(NewAdminMember())
}
// AddBalance 增加余额
func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalanceInp) (err error) {
var (
mb *entity.AdminMember
memberId = contexts.GetUserId(ctx)
)
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
if mb == nil {
err = gerror.New("用户信息不存在")
return err
}
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 更新我的余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
MemberId: memberId,
AppId: in.AppId,
AddonsName: in.AddonsName,
CreditGroup: in.SelfCreditGroup,
Num: in.SelfNum,
Remark: fmt.Sprintf("为后台用户:%v 操作%v", mb.Id, in.Remark),
})
if err != nil {
return err
}
// 更新对方余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
MemberId: mb.Id,
AppId: in.AppId,
AddonsName: in.AddonsName,
CreditGroup: in.OtherCreditGroup,
Num: in.OtherNum,
Remark: fmt.Sprintf("后台用户:%v 为你操作%v", memberId, in.Remark),
})
return
})
return
}
// AddIntegral 增加积分
func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddIntegralInp) (err error) {
var (
mb *entity.AdminMember
memberId = contexts.GetUserId(ctx)
)
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
if mb == nil {
err = gerror.New("用户信息不存在")
return err
}
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 更新我的余额
_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
MemberId: memberId,
AppId: in.AppId,
AddonsName: in.AddonsName,
CreditGroup: in.SelfCreditGroup,
Num: in.SelfNum,
Remark: fmt.Sprintf("为后台用户:%v 操作%v", mb.Id, in.Remark),
})
if err != nil {
return err
}
// 更新对方余额
_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
MemberId: mb.Id,
AppId: in.AppId,
AddonsName: in.AddonsName,
CreditGroup: in.OtherCreditGroup,
Num: in.OtherNum,
Remark: fmt.Sprintf("后台用户:%v 为你操作%v", memberId, in.Remark),
})
return
})
return
}
// UpdateCash 修改提现信息
func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCashInp) (err error) {
memberId := contexts.Get(ctx).User.Id
@@ -253,77 +345,67 @@ func (s *sAdminMember) UpdatePwd(ctx context.Context, in adminin.MemberUpdatePwd
// ResetPwd 重置密码
func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdInp) (err error) {
var (
memberInfo *entity.AdminMember
memberId = contexts.GetUserId(ctx)
mb *entity.AdminMember
memberId = contexts.GetUserId(ctx)
)
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&memberInfo); err != nil {
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
if memberInfo == nil {
if mb == nil {
err = gerror.New("用户信息不存在")
return err
}
if memberInfo.Pid != memberId && !s.VerifySuperId(ctx, memberId) {
err = gerror.New("操作非法")
return err
return
}
_, err = s.FilterAuthModel(ctx, memberId).
Where("id", in.Id).
Data(g.Map{
"password_hash": gmd5.MustEncryptString(in.Password + memberInfo.Salt),
"password_hash": gmd5.MustEncryptString(in.Password + mb.Salt),
"updated_at": gtime.Now(),
}).
Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return
}
// EmailUnique 菜单名称是否唯一
func (s *sAdminMember) EmailUnique(ctx context.Context, in adminin.MemberEmailUniqueInp) (*adminin.MemberEmailUniqueModel, error) {
var res adminin.MemberEmailUniqueModel
func (s *sAdminMember) EmailUnique(ctx context.Context, in adminin.MemberEmailUniqueInp) (res *adminin.MemberEmailUniqueModel, err error) {
isUnique, err := dao.AdminMember.IsUniqueEmail(ctx, in.Id, in.Email)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
res = new(adminin.MemberEmailUniqueModel)
res.IsUnique = isUnique
return &res, nil
return
}
// MobileUnique 手机号是否唯一
func (s *sAdminMember) MobileUnique(ctx context.Context, in adminin.MemberMobileUniqueInp) (*adminin.MemberMobileUniqueModel, error) {
var res adminin.MemberMobileUniqueModel
func (s *sAdminMember) MobileUnique(ctx context.Context, in adminin.MemberMobileUniqueInp) (res *adminin.MemberMobileUniqueModel, err error) {
isUnique, err := dao.AdminMember.IsUniqueMobile(ctx, in.Id, in.Mobile)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
res = new(adminin.MemberMobileUniqueModel)
res.IsUnique = isUnique
return &res, nil
return
}
// NameUnique 菜单名称是否唯一
func (s *sAdminMember) NameUnique(ctx context.Context, in adminin.MemberNameUniqueInp) (*adminin.MemberNameUniqueModel, error) {
var res adminin.MemberNameUniqueModel
func (s *sAdminMember) NameUnique(ctx context.Context, in adminin.MemberNameUniqueInp) (res *adminin.MemberNameUniqueModel, err error) {
isUnique, err := dao.AdminMember.IsUniqueName(ctx, in.Id, in.Username)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
res = new(adminin.MemberNameUniqueModel)
res.IsUnique = isUnique
return &res, nil
return
}
// VerifySuperId 验证是否为超管
@@ -338,67 +420,71 @@ func (s *sAdminMember) VerifySuperId(ctx context.Context, verifyId int64) bool {
}
// Delete 删除
func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) error {
func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) (err error) {
if s.VerifySuperId(ctx, gconv.Int64(in.Id)) {
return gerror.New("超管账号禁止删除！")
err = gerror.New("超管账号禁止删除！")
return
}
memberId := contexts.GetUserId(ctx)
if memberId <= 0 {
return gerror.New("获取用户信息失败！")
err = gerror.New("获取用户信息失败！")
return
}
_, err := s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
_, err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err error) {
opMemberId := contexts.GetUserId(ctx)
if opMemberId <= 0 {
return gerror.New("获取用户信息失败！")
err = gerror.New("获取用户信息失败！")
return
}
if in.Username == "" {
return gerror.New("帐号不能为空")
err = gerror.New("帐号不能为空")
return
}
uniqueName, err := dao.AdminMember.IsUniqueName(ctx, in.Id, in.Username)
if err != nil {
return gerror.Wrap(err, consts.ErrorORM)
return
}
if !uniqueName {
return gerror.New("用户名已存在")
err = gerror.New("用户名已存在")
return
}
if in.Mobile != "" {
uniqueMobile, err := dao.AdminMember.IsUniqueMobile(ctx, in.Id, in.Mobile)
if err != nil {
return gerror.Wrap(err, consts.ErrorORM)
return err
}
if !uniqueMobile {
return gerror.New("手机号已存在")
err = gerror.New("手机号已存在")
return err
}
}
if in.Email != "" {
uniqueEmail, err := dao.AdminMember.IsUniqueEmail(ctx, in.Id, in.Email)
if err != nil {
return gerror.Wrap(err, consts.ErrorORM)
return err
}
if !uniqueEmail {
return gerror.New("邮箱已存在")
err = gerror.New("邮箱已存在")
return err
}
}
// 修改
if in.Id > 0 {
if s.VerifySuperId(ctx, in.Id) {
return gerror.New("超管账号禁止编辑！")
err = gerror.New("超管账号禁止编辑！")
return
}
mod := s.FilterAuthModel(ctx, opMemberId)
@@ -413,14 +499,12 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
}
if _, err = mod.Where("id", in.Id).Data(in).Update(); err != nil {
return gerror.Wrap(err, consts.ErrorORM)
return
}
// 更新岗位
if err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds); err != nil {
return err
}
return nil
err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds)
return
}
// 新增用户时的额外属性
@@ -433,67 +517,55 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
data.Pid = opMemberId
data.Level, data.Tree, err = s.genTree(ctx, opMemberId)
if err != nil {
return err
return
}
id, err := dao.AdminMember.Ctx(ctx).Data(data).InsertAndGetId()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
err = dao.AdminMemberPost.UpdatePostIds(ctx, id, in.PostIds)
if err != nil {
return err
}
return nil
}
// MaxSort 最大排序
func (s *sAdminMember) MaxSort(ctx context.Context, in adminin.MemberMaxSortInp) (*adminin.MemberMaxSortModel, error) {
var res adminin.MemberMaxSortModel
if in.Id > 0 {
if err := dao.AdminMember.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
}
res.Sort = res.Sort + 10
return &res, nil
return
}
// View 获取信息
func (s *sAdminMember) View(ctx context.Context, in adminin.MemberViewInp) (res *adminin.MemberViewModel, err error) {
if err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Hook(hook.MemberInfo).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).
Hook(hook.MemberInfo).
Where("id", in.Id).
Scan(&res)
return
}
// List 获取列表
func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list []*adminin.MemberListModel, totalCount int, err error) {
mod := s.FilterAuthModel(ctx, contexts.GetUserId(ctx))
if in.RealName != "" {
mod = mod.WhereLike("real_name", "%"+in.RealName+"%")
}
if in.Username != "" {
mod = mod.WhereLike("username", "%"+in.Username+"%")
}
if in.Mobile > 0 {
mod = mod.Where("mobile", in.Mobile)
}
if in.Status > 0 {
mod = mod.Where("status", in.Status)
}
if in.DeptId > 0 {
mod = mod.Where("dept_id", in.DeptId)
}
if in.RoleId > 0 {
mod = mod.Where("role_id", in.RoleId)
}
if len(in.CreatedAt) == 2 {
mod = mod.WhereBetween("created_at", gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
}
@@ -501,25 +573,24 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, 0, err
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
if err = mod.Hook(hook.MemberInfo).Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
return nil, 0, gerror.Wrap(err, consts.ErrorORM)
return
}
for i := 0; i < len(list); i++ {
// 岗位
posts, err := dao.AdminMemberPost.Ctx(ctx).
Fields("post_id").
Where("member_id", list[i].Id).
Array()
if err != nil {
return nil, 0, gerror.Wrap(err, consts.ErrorORM)
return nil, 0, err
}
for _, v := range posts {
@@ -527,16 +598,13 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
}
}
return list, totalCount, nil
return
}
// genTree 生成关系树
func (s *sAdminMember) genTree(ctx context.Context, pid int64) (level int, newTree string, err error) {
var (
pInfo *entity.AdminMember
)
err = dao.AdminMember.Ctx(ctx).Where("id", pid).Scan(&pInfo)
if err != nil {
var pInfo *entity.AdminMember
if err = dao.AdminMember.Ctx(ctx).Where("id", pid).Scan(&pInfo); err != nil {
return
}
@@ -547,7 +615,6 @@ func (s *sAdminMember) genTree(ctx context.Context, pid int64) (level int, newTr
level = pInfo.Level + 1
newTree = tree.GenLabel(pInfo.Tree, pInfo.Id)
return
}
@@ -585,75 +652,72 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
if err != nil {
return nil, err
}
res.MemberLoginStatModel = stat
res.MemberLoginStatModel = stat
res.Mobile = gstr.HideStr(res.Mobile, 40, `*`)
res.Email = gstr.HideStr(res.Email, 40, `*`)
res.OpenId, _ = service.CommonWechat().GetOpenId(ctx)
return
}
// Login 提交登录
func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (res *adminin.MemberLoginModel, err error) {
var (
roleInfo *entity.AdminRole
memberInfo *entity.AdminMember
expires = g.Cfg().MustGet(ctx, "jwt.expires", 1).Int64()
ro *entity.AdminRole
mb *entity.AdminMember
expires = g.Cfg().MustGet(ctx, "jwt.expires", 1).Int64()
)
err = dao.AdminMember.Ctx(ctx).Where("username", in.Username).Scan(&memberInfo)
if err != nil {
if err = dao.AdminMember.Ctx(ctx).Where("username", in.Username).Scan(&mb); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if memberInfo == nil {
if mb == nil {
err = gerror.New("账号不存在")
return
}
if memberInfo.Salt == "" {
if mb.Salt == "" {
err = gerror.New("用户信息错误")
return
}
err = simple.CheckPassword(in.Password, memberInfo.Salt, memberInfo.PasswordHash)
if err != nil {
if err = simple.CheckPassword(in.Password, mb.Salt, mb.PasswordHash); err != nil {
return
}
if memberInfo.Status != consts.StatusEnabled {
if mb.Status != consts.StatusEnabled {
err = gerror.New("账号已被禁用")
return
}
err = dao.AdminRole.Ctx(ctx).
Fields("id,key,status").
Where("id", memberInfo.RoleId).
Scan(&roleInfo)
if err != nil {
if err = dao.AdminRole.Ctx(ctx).Fields("id,key,status").Where("id", mb.RoleId).Scan(&ro); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if roleInfo == nil {
if ro == nil {
err = gerror.New("角色不存在")
return
}
if roleInfo.Status != consts.StatusEnabled {
if ro.Status != consts.StatusEnabled {
err = gerror.New("角色已被禁用")
return
}
identity := &model.Identity{
Id: memberInfo.Id,
Pid: memberInfo.Pid,
DeptId: memberInfo.DeptId,
RoleId: roleInfo.Id,
RoleKey: roleInfo.Key,
Username: memberInfo.Username,
RealName: memberInfo.RealName,
Avatar: memberInfo.Avatar,
Email: memberInfo.Email,
Mobile: memberInfo.Mobile,
Id: mb.Id,
Pid: mb.Pid,
DeptId: mb.DeptId,
RoleId: ro.Id,
RoleKey: ro.Key,
Username: mb.Username,
RealName: mb.RealName,
Avatar: mb.Avatar,
Email: mb.Email,
Mobile: mb.Mobile,
Exp: gtime.Timestamp() + expires,
Expires: expires,
App: consts.AppAdmin,
@@ -665,14 +729,13 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
return
}
// 更新登录信息
_, err = dao.AdminMember.Ctx(ctx).
Data(do.AdminMember{AuthKey: gmd5.MustEncryptString(token)}).
Where(do.AdminMember{Id: memberInfo.Id}).
Update()
update := do.AdminMember{
AuthKey: jwt.GenAuthKey(token),
LastActiveAt: gtime.Now(),
}
if err != nil {
err = gerror.New(err.Error())
// 更新登录信息
if _, err = dao.AdminMember.Ctx(ctx).Data(update).Where(do.AdminMember{Id: mb.Id}).Update(); err != nil {
return
}
@@ -682,7 +745,7 @@ func (s *sAdminMember) Login(ctx context.Context, in adminin.MemberLoginInp) (re
Expires: expires,
}
return res, nil
return
}
// RoleMemberList 获取角色下的用户列表
@@ -695,61 +758,49 @@ func (s *sAdminMember) RoleMemberList(ctx context.Context, in adminin.RoleMember
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list)
if err != nil {
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
return list, totalCount, err
return
}
// Status 更新状态
func (s *sAdminMember) Status(ctx context.Context, in adminin.MemberStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if s.VerifySuperId(ctx, in.Id) {
return gerror.New("超管账号不能更改状态")
err = gerror.New("超管账号不能更改状态")
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
_, err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// GetIdByCode 通过邀请码获取用户ID
func (s *sAdminMember) GetIdByCode(ctx context.Context, in adminin.GetIdByCodeInp) (res *adminin.GetIdByCodeModel, err error) {
if err = dao.AdminMember.Ctx(ctx).
Fields("invite_code").
Where("invite_code", in.Code).
Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.AdminMember.Ctx(ctx).Fields("invite_code").Where("invite_code", in.Code).Scan(&res)
return
}
// Select 获取可选的用户选项
@@ -758,10 +809,7 @@ func (s *sAdminMember) Select(ctx context.Context, in adminin.MemberSelectInp) (
Fields("id as value,real_name as label,username,avatar").
Handler(handler.FilterAuthWithField("id")).
Scan(&res)
if err != nil {
return nil, gerror.Wrap(err, consts.ErrorORM)
}
return res, nil
return
}
func (s *sAdminMember) FilterAuthModel(ctx context.Context, memberId int64) *gdb.Model {
@@ -781,7 +829,7 @@ func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLog
Where("status", consts.StatusEnabled).
Scan(&models)
if err != nil {
return nil, err
return
}
res = new(adminin.MemberLoginStatModel)
@@ -791,13 +839,6 @@ func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLog
res.LastLoginAt = models.LoginAt
res.LastLoginIp = models.LoginIp
res.LoginCount, err = dao.SysLoginLog.Ctx(ctx).
Where("member_id", in.MemberId).
Where("status", consts.StatusEnabled).Count()
if err != nil {
return nil, err
}
res.LoginCount, err = dao.SysLoginLog.Ctx(ctx).Where("member_id", in.MemberId).Where("status", consts.StatusEnabled).Count()
return
}

14
server/internal/logic/admin/member_post.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package admin
import (
@@ -29,7 +28,7 @@ func (s *sAdminMemberPost) UpdatePostIds(ctx context.Context, memberId int64, po
_, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", memberId).Delete()
if err != nil {
err = gerror.Wrap(err, "删除失败")
return err
return
}
for i := 0; i < len(postIds); i++ {
@@ -44,24 +43,21 @@ func (s *sAdminMemberPost) UpdatePostIds(ctx context.Context, memberId int64, po
}
}
return nil
return
}
// GetMemberByIds 获取指定用户的岗位ids
func (s *sAdminMemberPost) GetMemberByIds(ctx context.Context, memberId int64) (postIds []int64, err error) {
var list []*entity.AdminMemberPost
err = dao.AdminMemberPost.Ctx(ctx).
Fields("post_id").
Where("member_id", memberId).
Scan(&list)
err = dao.AdminMemberPost.Ctx(ctx).Fields("post_id").Where("member_id", memberId).Scan(&list)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return postIds, err
return
}
for i := 0; i < len(list); i++ {
postIds = append(postIds, list[i].PostId)
}
return postIds, nil
return
}

156
server/internal/logic/admin/menu.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package admin
import (
@@ -18,10 +17,9 @@ import (
"hotgo/internal/dao"
"hotgo/internal/library/casbin"
"hotgo/internal/library/contexts"
"hotgo/internal/model"
"hotgo/internal/model/do"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/adminin"
"hotgo/internal/model/input/form"
"hotgo/internal/service"
"hotgo/utility/convert"
"hotgo/utility/tree"
@@ -37,94 +35,8 @@ func init() {
service.RegisterAdminMenu(NewAdminMenu())
}
// RoleList 查询角色菜单列表
func (s *sAdminMenu) RoleList(ctx context.Context, in adminin.MenuRoleListInp) (*adminin.MenuRoleListModel, error) {
var (
mod = dao.AdminRoleMenu.Ctx(ctx)
roleMenu []*entity.AdminRoleMenu
lst []*model.LabelTreeMenu
res adminin.MenuRoleListModel
err error
checkedKeys []int64
)
// 获取选中菜单ID
if in.RoleId > 0 {
mod = mod.Where("role_id", in.RoleId)
}
if err = mod.Fields().Scan(&roleMenu); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
for i := 0; i < len(roleMenu); i++ {
checkedKeys = append(checkedKeys, roleMenu[i].MenuId)
}
res.CheckedKeys = checkedKeys
// 获取菜单树
lst, err = dao.AdminMenu.GenLabelTreeList(ctx, 0)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
_ = gconv.Structs(lst, &res.Menus)
return &res, nil
}
// SearchList 查询菜单列表
func (s *sAdminMenu) SearchList(ctx context.Context, req *menu.SearchListReq) (*menu.SearchListRes, error) {
var (
mod = dao.AdminMenu.Ctx(ctx)
lst []*model.TreeMenu
res menu.SearchListRes
searchResult []*entity.AdminMenu
id int64
ids []int64
err error
)
if req.Name != "" {
mod = mod.WhereLike("name", "%"+req.Name+"%")
}
if req.Status > 0 {
mod = mod.Where("status", req.Status)
}
if req.Name != "" || req.Status > 0 {
err = mod.Scan(&searchResult)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
for i := 0; i < len(searchResult); i++ {
id, err = dao.AdminMenu.TopPid(ctx, searchResult[i])
ids = append(ids, id)
}
}
lst, err = dao.AdminMenu.GenTreeList(ctx, 0, ids)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
_ = gconv.Structs(lst, &res)
return &res, nil
}
// MaxSort 最大排序
func (s *sAdminMenu) MaxSort(ctx context.Context, req *menu.MaxSortReq) (*menu.MaxSortRes, error) {
var (
res menu.MaxSortRes
err error
)
func (s *sAdminMenu) MaxSort(ctx context.Context, req *menu.MaxSortReq) (res *menu.MaxSortRes, err error) {
if req.Id > 0 {
if err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
@@ -132,45 +44,30 @@ func (s *sAdminMenu) MaxSort(ctx context.Context, req *menu.MaxSortReq) (*menu.M
}
}
res.Sort = res.Sort + 10
if res == nil {
res = new(menu.MaxSortRes)
}
return &res, nil
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// NameUnique 菜单名称是否唯一
func (s *sAdminMenu) NameUnique(ctx context.Context, req *menu.NameUniqueReq) (*menu.NameUniqueRes, error) {
var (
res menu.NameUniqueRes
err error
)
func (s *sAdminMenu) NameUnique(ctx context.Context, req *menu.NameUniqueReq) (res *menu.NameUniqueRes, err error) {
res = new(menu.NameUniqueRes)
res.IsUnique, err = dao.AdminMenu.IsUniqueName(ctx, req.Id, req.Name)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return &res, nil
return
}
// CodeUnique 菜单编码是否唯一
func (s *sAdminMenu) CodeUnique(ctx context.Context, req *menu.CodeUniqueReq) (*menu.CodeUniqueRes, error) {
var (
res menu.CodeUniqueRes
err error
)
func (s *sAdminMenu) CodeUnique(ctx context.Context, req *menu.CodeUniqueReq) (res *menu.CodeUniqueRes, err error) {
res = new(menu.CodeUniqueRes)
res.IsUnique, err = dao.AdminMenu.IsUniqueName(ctx, req.Id, req.Code)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return &res, nil
return
}
// Delete 删除
func (s *sAdminMenu) Delete(ctx context.Context, req *menu.DeleteReq) error {
func (s *sAdminMenu) Delete(ctx context.Context, req *menu.DeleteReq) (err error) {
exist, err := dao.AdminMenu.Ctx(ctx).Where("pid", req.Id).One()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
@@ -180,12 +77,7 @@ func (s *sAdminMenu) Delete(ctx context.Context, req *menu.DeleteReq) error {
return gerror.New("请先删除该菜单下的所有菜单！")
}
_, err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Edit 修改/新增
@@ -270,12 +162,8 @@ func (s *sAdminMenu) Edit(ctx context.Context, req *menu.EditReq) (err error) {
// View 获取信息
func (s *sAdminMenu) View(ctx context.Context, req *menu.ViewReq) (res *menu.ViewRes, err error) {
if err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Scan(&res)
return
}
// List 获取菜单列表
@@ -283,7 +171,7 @@ func (s *sAdminMenu) List(ctx context.Context, req *menu.ListReq) (lists []map[s
var models []*adminin.MenuTree
err = dao.AdminMenu.Ctx(ctx).Order("sort asc,id desc").Scan(&models)
if err != nil {
return lists, err
return
}
return tree.GenTree(gconv.SliceMap(models)), nil
}
@@ -344,7 +232,7 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (lists rol
Where("role_id", contexts.GetRoleId(ctx)).
Array()
if err != nil {
return role.DynamicRes{}, err
return lists, err
}
if len(array) > 0 {
pidList, err := dao.AdminMenu.Ctx(ctx).Fields("pid").WhereIn("id", array).Group("pid").Array()
@@ -359,11 +247,11 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (lists rol
}
if err = mod.Order("sort asc,id desc").Scan(&allMenus); err != nil {
return lists, err
return
}
if len(allMenus) == 0 {
return lists, nil
return
}
for _, v := range allMenus {
@@ -403,7 +291,7 @@ func (s *sAdminMenu) LoginPermissions(ctx context.Context, memberId int64) (list
}
if err = mod.Scan(&allPermissions); err != nil {
return lists, err
return
}
// 无权限

15
server/internal/logic/admin/monitor.go
View File

@@ -35,19 +35,10 @@ func init() {
func (s *sAdminMonitor) StartMonitor(ctx context.Context) {
simple.SafeGo(ctx, func(ctx context.Context) {
s.data.STartTime = gtime.Now().Timestamp()
intranetIP, err := location.GetLocalIP()
if err != nil {
g.Log().Infof(ctx, "parse intranetIP err:%+v", err)
}
s.data.IntranetIP = intranetIP
s.data.IntranetIP, _ = location.GetLocalIP()
s.data.PublicIP, _ = location.GetPublicIP(ctx)
publicIP, err := location.GetPublicIP(ctx)
if err != nil {
g.Log().Infof(ctx, "parse publicIP err:%+v", err)
}
s.data.PublicIP = publicIP
_, err = gcron.Add(ctx, "@every 1s", func(ctx context.Context) {
_, err := gcron.Add(ctx, "@every 1s", func(ctx context.Context) {
s.Lock()
defer s.Unlock()
s.netIO()

27
server/internal/logic/admin/notice.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package admin
import (
@@ -42,14 +41,9 @@ func (s *sAdminNotice) Model(ctx context.Context, option ...*handler.Option) *gd
}
// Delete 删除
func (s *sAdminNotice) Delete(ctx context.Context, in adminin.NoticeDeleteInp) error {
_, err := s.Model(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
func (s *sAdminNotice) Delete(ctx context.Context, in adminin.NoticeDeleteInp) (err error) {
_, err = s.Model(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
@@ -115,34 +109,29 @@ func (s *sAdminNotice) Edit(ctx context.Context, in adminin.NoticeEditInp) (err
}
})
return nil
return
}
// Status 更新部门状态
func (s *sAdminNotice) Status(ctx context.Context, in adminin.NoticeStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
_, err = s.Model(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// MaxSort 最大排序

390
server/internal/logic/admin/order.go Normal file
View File

@@ -0,0 +1,390 @@
// Package admin
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
package admin
import (
"context"
"fmt"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/contexts"
"hotgo/internal/library/hgorm"
"hotgo/internal/library/hgorm/handler"
"hotgo/internal/library/payment"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/adminin"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/payin"
"hotgo/internal/service"
"hotgo/internal/websocket"
"hotgo/utility/convert"
"hotgo/utility/excel"
"hotgo/utility/simple"
"hotgo/utility/validate"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/util/gconv"
)
type sAdminOrder struct{}
func NewAdminOrder() *sAdminOrder {
return &sAdminOrder{}
}
func init() {
service.RegisterAdminOrder(NewAdminOrder())
}
// Model 充值订单ORM模型
func (s *sAdminOrder) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
return handler.Model(dao.AdminOrder.Ctx(ctx), option...)
}
// AcceptRefund 受理申请退款
func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRefundInp) (err error) {
view, err := s.View(ctx, adminin.OrderViewInp{Id: in.Id})
if err != nil {
return err
}
if view == nil {
err = gerror.New("订单不存在")
return
}
if view.Status != consts.OrderStatusReturnRequest {
err = gerror.New("当前订单状态不是申请退款状态，无需受理")
return
}
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 同意退款
if in.Status == consts.OrderStatusReturned {
// 更新余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
MemberId: view.MemberId,
AppId: contexts.GetModule(ctx),
AddonsName: contexts.GetAddonName(ctx),
CreditGroup: consts.CreditGroupBalanceRefund,
Num: -view.Money,
MapId: view.Id,
Remark: fmt.Sprintf("余额退款:%v", in.Remark),
})
if err != nil {
return err
}
_, err = service.PayRefund().Refund(ctx, payin.PayRefundInp{
OrderSn: view.OrderSn,
RefundMoney: view.Money,
Reason: view.RefundReason,
Remark: in.Remark,
})
if err != nil {
return err
}
}
update := g.Map{
dao.AdminOrder.Columns().Status: in.Status,
dao.AdminOrder.Columns().RejectRefundReason: in.RejectRefundReason,
}
_, err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Data(update).Update()
return
})
return
}
// ApplyRefund 申请退款
func (s *sAdminOrder) ApplyRefund(ctx context.Context, in adminin.OrderApplyRefundInp) (err error) {
view, err := s.View(ctx, adminin.OrderViewInp{Id: in.Id})
if err != nil {
return err
}
if view == nil {
err = gerror.New("订单不存在")
return
}
if view.Status == consts.OrderStatusReturnRequest {
err = gerror.New("当前订单退款正在申请处理，请勿重复提交！")
return
}
if view.Status != consts.OrderStatusDone {
err = gerror.New("当前订单状态不支持申请退款，如有疑问请联系管理员！")
return
}
update := g.Map{
dao.AdminOrder.Columns().Status: consts.OrderStatusReturnRequest,
dao.AdminOrder.Columns().RefundReason: in.RefundReason,
}
_, err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Data(update).Update()
return
}
// PayNotify 支付成功通知
func (s *sAdminOrder) PayNotify(ctx context.Context, in payin.NotifyCallFuncInp) (err error) {
var models *entity.AdminOrder
if err = s.Model(ctx).Where(dao.AdminOrder.Columns().OrderSn, in.Pay.OrderSn).Scan(&models); err != nil {
return
}
if models == nil {
err = gerror.New("订单不存在")
return
}
if models.Status != consts.OrderStatusNotPay {
err = gerror.New("订单已被处理，无需重复操作")
return
}
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 更新订单状态
_, err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, models.Id).Data(g.Map{
dao.AdminOrder.Columns().Status: consts.OrderStatusDone,
}).Update()
if err != nil {
return
}
// 更新余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
MemberId: models.MemberId,
AppId: in.Pay.AppId,
AddonsName: in.Pay.AddonsName,
CreditGroup: consts.CreditGroupBalanceRecharge,
Num: models.Money,
MapId: models.Id,
Remark: in.Pay.Subject,
})
if err != nil {
return err
}
return
})
if err != nil {
return
}
// 推送通知
response := &websocket.WResponse{
Event: "admin/order/notify",
Data: in.Pay,
}
simple.SafeGo(ctx, func(ctx context.Context) {
websocket.SendToUser(in.Pay.MemberId, response)
})
return
}
// Create 创建充值订单
func (s *sAdminOrder) Create(ctx context.Context, in adminin.OrderCreateInp) (res *adminin.OrderCreateModel, err error) {
var (
subject = "支付订单"
orderSn = payment.GenOrderSn()
)
switch in.OrderType {
case consts.OrderTypeBalance:
subject = fmt.Sprintf("余额充值:￥%v", in.Money)
case consts.OrderTypeProduct:
// 读取商品信息，读取商品最终支付价格
// ...
//in.Money = 999
//subject = fmt.Sprintf("购买商品:%v", "测试商品名称")
default:
err = gerror.New("不支持的订单类型")
return
}
res = new(adminin.OrderCreateModel)
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
_, err = s.Model(ctx).Data(entity.AdminOrder{
MemberId: contexts.GetUserId(ctx),
OrderType: in.OrderType,
ProductId: in.ProductId,
OrderSn: orderSn,
Money: in.Money,
Remark: in.Remark,
Status: consts.OrderStatusNotPay,
}).Insert()
if err != nil {
return
}
create, err := service.Pay().Create(ctx, payin.PayCreateInp{
Subject: subject,
OrderSn: orderSn,
OrderGroup: consts.OrderGroupAdminOrder,
PayType: in.PayType,
TradeType: in.TradeType,
PayAmount: in.Money,
ReturnUrl: in.ReturnUrl,
})
if err != nil {
return err
}
res.Order = create.Order
return
})
return
}
// List 获取充值订单列表
func (s *sAdminOrder) List(ctx context.Context, in adminin.OrderListInp) (list []*adminin.OrderListModel, totalCount int, err error) {
mod := s.Model(ctx)
// 查询业务订单号
if in.OrderSn != "" {
mod = mod.WhereLike(dao.AdminOrder.Columns().OrderSn, in.OrderSn)
}
// 查询状态
if in.Status > 0 {
mod = mod.Where(dao.AdminOrder.Columns().Status, in.Status)
}
// 查询创建时间
if len(in.CreatedAt) == 2 {
mod = mod.WhereBetween(dao.AdminOrder.Columns().CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
}
// 查询商户订单号
if in.PayLogOutTradeNo != "" {
mod = mod.WhereLike(dao.PayLog.Columns().OutTradeNo, in.PayLogOutTradeNo)
}
if in.MemberId > 0 {
mod = mod.Where(dao.AdminOrder.Columns().MemberId, in.MemberId)
}
mod = mod.LeftJoin(hgorm.GenJoinOnRelation(
dao.AdminOrder.Table(), dao.AdminOrder.Columns().OrderSn, // 主表表名,关联条件
dao.PayLog.Table(), "payLog", dao.PayLog.Columns().OrderSn, // 关联表表名,别名,关联条件
)...)
totalCount, err = mod.Clone().Count(1)
if err != nil {
return
}
if totalCount == 0 {
return
}
//关联表select
fields, err := hgorm.GenJoinSelect(ctx, adminin.OrderListModel{}, dao.AdminOrder, []*hgorm.Join{
{Dao: dao.PayLog, Alias: "payLog"},
})
err = mod.Fields(fields).Page(in.Page, in.PerPage).OrderDesc(dao.AdminOrder.Columns().Id).Scan(&list)
return
}
// Export 导出充值订单
func (s *sAdminOrder) Export(ctx context.Context, in adminin.OrderListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return
}
// 字段的排序是依据tags的字段顺序，如果你不想使用默认的排序方式，可以直接定义 tags = []string{"字段名称", "字段名称2", ...}
tags, err := convert.GetEntityDescTags(adminin.OrderExportModel{})
if err != nil {
return
}
var (
fileName = "导出充值订单-" + gctx.CtxId(ctx) + ".xlsx"
sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
exports []adminin.OrderExportModel
)
if err = gconv.Scan(list, &exports); err != nil {
return
}
err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
return
}
// Edit 修改/新增充值订单
func (s *sAdminOrder) Edit(ctx context.Context, in adminin.OrderEditInp) (err error) {
// 修改
if in.Id > 0 {
_, err = s.Model(ctx).
FieldsEx(
dao.AdminOrder.Columns().Id,
dao.AdminOrder.Columns().CreatedAt,
).
Where(dao.AdminOrder.Columns().Id, in.Id).Data(in).Update()
return
}
// 新增
_, err = s.Model(ctx, &handler.Option{FilterAuth: false}).
FieldsEx(
dao.AdminOrder.Columns().Id,
).
Data(in).Insert()
return
}
// Delete 删除充值订单
func (s *sAdminOrder) Delete(ctx context.Context, in adminin.OrderDeleteInp) (err error) {
_, err = s.Model(ctx).
Where(dao.AdminOrder.Columns().Id, in.Id).
Where(dao.AdminOrder.Columns().Status, consts.OrderStatusClose).
Delete()
return
}
// View 获取充值订单指定信息
func (s *sAdminOrder) View(ctx context.Context, in adminin.OrderViewInp) (res *adminin.OrderViewModel, err error) {
err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Scan(&res)
return
}
// Status 更新充值订单状态
func (s *sAdminOrder) Status(ctx context.Context, in adminin.OrderStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return
}
_, err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Data(g.Map{
dao.AdminOrder.Columns().Status: in.Status,
}).Update()
return
}

107
server/internal/logic/admin/post.go
View File

@@ -3,16 +3,15 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package admin
import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/os/gtime"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/model/input/adminin"
"hotgo/internal/model/input/form"
"hotgo/internal/service"
"hotgo/utility/validate"
)
@@ -28,126 +27,109 @@ func init() {
}
// Delete 删除
func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) error {
func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) (err error) {
exist, err := dao.AdminMemberPost.Ctx(ctx).Where("post_id", in.Id).One()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
if !exist.IsEmpty() {
return gerror.New("请先解除该岗位下所有已关联用户关联关系！")
}
_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err error) {
if in.Name == "" {
err = gerror.New("名称不能为空")
return err
return
}
if in.Code == "" {
err = gerror.New("编码不能为空")
return err
return
}
uniqueName, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
if !uniqueName {
err = gerror.New("名称已存在")
return err
return
}
uniqueCode, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
if !uniqueCode {
err = gerror.New("编码已存在")
return err
return
}
// 修改
if in.Id > 0 {
_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// 新增
_, err = dao.AdminPost.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// MaxSort 最大排序
func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (*adminin.PostMaxSortModel, error) {
var res adminin.PostMaxSortModel
func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (res *adminin.PostMaxSortModel, err error) {
if in.Id > 0 {
if err := dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
if err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
}
res.Sort = res.Sort + 10
return &res, nil
if res == nil {
res = new(adminin.PostMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// NameUnique 菜单名称是否唯一
func (s *sAdminPost) NameUnique(ctx context.Context, in adminin.PostNameUniqueInp) (*adminin.PostNameUniqueModel, error) {
var res adminin.PostNameUniqueModel
func (s *sAdminPost) NameUnique(ctx context.Context, in adminin.PostNameUniqueInp) (res *adminin.PostNameUniqueModel, err error) {
isUnique, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
res = new(adminin.PostNameUniqueModel)
res.IsUnique = isUnique
return &res, nil
return
}
// CodeUnique 编码是否唯一
func (s *sAdminPost) CodeUnique(ctx context.Context, in adminin.PostCodeUniqueInp) (*adminin.PostCodeUniqueModel, error) {
var res adminin.PostCodeUniqueModel
func (s *sAdminPost) CodeUnique(ctx context.Context, in adminin.PostCodeUniqueInp) (res *adminin.PostCodeUniqueModel, err error) {
isUnique, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
res = new(adminin.PostCodeUniqueModel)
res.IsUnique = isUnique
return &res, nil
return
}
// View 获取指定字典类型信息
func (s *sAdminPost) View(ctx context.Context, in adminin.PostViewInp) (res *adminin.PostViewModel, err error) {
if err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Scan(&res)
return
}
// List 获取列表
@@ -172,18 +154,15 @@ func (s *sAdminPost) List(ctx context.Context, in adminin.PostListInp) (list []*
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
if totalCount == 0 {
return list, totalCount, nil
}
if err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
return list, totalCount, err
err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&list)
return
}
// GetMemberByStartName 获取指定用户的第一岗位
@@ -196,7 +175,7 @@ func (s *sAdminPost) GetMemberByStartName(ctx context.Context, memberId int64) (
Value()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return name, err
return
}
val, err := dao.AdminPost.Ctx(ctx).
@@ -206,7 +185,7 @@ func (s *sAdminPost) GetMemberByStartName(ctx context.Context, memberId int64) (
Value()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return name, err
return
}
return val.String(), nil
@@ -216,26 +195,20 @@ func (s *sAdminPost) GetMemberByStartName(ctx context.Context, memberId int64) (
func (s *sAdminPost) Status(ctx context.Context, in adminin.PostStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}

28
server/internal/logic/admin/role.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package admin
import (
@@ -24,6 +23,7 @@ import (
"hotgo/internal/service"
"hotgo/utility/auth"
"hotgo/utility/convert"
"hotgo/utility/tree"
"sort"
)
@@ -42,6 +42,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
if auth.IsExceptAuth(ctx, path) {
return true
}
var (
user = contexts.Get(ctx).User
superRoleKey = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
@@ -49,7 +50,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
)
if user == nil {
g.Log().Warning(ctx, "admin Verify user = nil")
g.Log().Info(ctx, "admin Verify user = nil")
return false
}
@@ -58,7 +59,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
}
ok, err := casbin.Enforcer.Enforce(user.RoleKey, path, method)
if err != nil {
g.Log().Warningf(ctx, "admin Verify Enforce err:%+v", err)
g.Log().Infof(ctx, "admin Verify Enforce err:%+v", err)
return false
}
@@ -70,8 +71,15 @@ func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (res *adm
var (
mod = dao.AdminRole.Ctx(ctx)
models []*entity.AdminRole
pid int64 = 0
)
// 非超管只获取下级角色
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
pid = contexts.GetRoleId(ctx)
mod = mod.WhereLike(dao.AdminRole.Columns().Tree, "%"+tree.GetIdLabel(pid)+"%")
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
@@ -84,7 +92,7 @@ func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (res *adm
}
res = new(adminin.RoleListModel)
res.List = s.treeList(0, models)
res.List = s.treeList(pid, models)
return
}
@@ -138,8 +146,8 @@ func (s *sAdminRole) GetPermissions(ctx context.Context, reqInfo *role.GetPermis
}
// UpdatePermissions 更改角色菜单权限
func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.UpdatePermissionsReq) error {
return dao.AdminRoleMenu.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.UpdatePermissionsReq) (err error) {
err = dao.AdminRoleMenu.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
_, err = dao.AdminRoleMenu.Ctx(ctx).Where("role_id", reqInfo.RoleId).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
@@ -166,8 +174,14 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.Update
return err
}
return casbin.Refresh(ctx)
return
})
if err != nil {
return
}
return casbin.Refresh(ctx)
}
func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {

115
server/internal/logic/common/upload.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package common
import (
@@ -59,9 +58,17 @@ func (s *sCommonUpload) UploadFile(ctx context.Context, file *ghttp.UploadFile)
return
}
_, err = f.GetFileType(meta.Ext)
if _, err = f.GetFileType(meta.Ext); err != nil {
return
}
result, err = s.HasFile(ctx, meta.Md5)
if err != nil {
return nil, err
return
}
if result != nil {
return
}
conf, err := service.SysConfig().GetUpload(ctx)
@@ -98,11 +105,22 @@ func (s *sCommonUpload) UploadImage(ctx context.Context, file *ghttp.UploadFile)
}
if !f.IsImgType(meta.Ext) {
return nil, gerror.New("上传的文件不是图片")
err = gerror.New("上传的文件不是图片")
return
}
if meta.Size > 2*1024*1024 {
return nil, gerror.New("图片大小不能超过2MB")
err = gerror.New("图片大小不能超过2MB")
return
}
result, err = s.HasFile(ctx, meta.Md5)
if err != nil {
return
}
if result != nil {
return
}
conf, err := service.SysConfig().GetUpload(ctx)
@@ -122,16 +140,13 @@ func (s *sCommonUpload) UploadImage(ctx context.Context, file *ghttp.UploadFile)
case consts.UploadDriveQiNiu:
return s.UploadQiNiu(ctx, conf, file, meta)
default:
return nil, gerror.Newf("暂不支持上传驱动:%v", conf.Drive)
err = gerror.Newf("暂不支持上传驱动:%v", conf.Drive)
return
}
}
// UploadLocal 上传本地
func (s *sCommonUpload) UploadLocal(ctx context.Context, conf *model.UploadConfig, file *ghttp.UploadFile, meta *sysin.UploadFileMeta) (result *sysin.AttachmentListModel, err error) {
if ok, err1 := s.HasFile(ctx, meta.Md5); ok || err1 != nil {
return
}
var (
value = g.Cfg().MustGet(ctx, "server.serverRoot")
nowDate = time.Now().Format("2006-01-02")
@@ -158,7 +173,7 @@ func (s *sCommonUpload) UploadLocal(ctx context.Context, conf *model.UploadConfi
attachment, err := service.SysAttachment().Add(ctx, meta, fullPath, consts.UploadDriveLocal)
if err != nil {
return nil, err
return
}
attachment.FileUrl = s.LastUrl(ctx, conf, attachment.FileUrl, attachment.Drive)
@@ -171,10 +186,6 @@ func (s *sCommonUpload) UploadLocal(ctx context.Context, conf *model.UploadConfi
// UploadUCloud 上传UCloud对象存储
func (s *sCommonUpload) UploadUCloud(ctx context.Context, conf *model.UploadConfig, file *ghttp.UploadFile, meta *sysin.UploadFileMeta) (result *sysin.AttachmentListModel, err error) {
if ok, err1 := s.HasFile(ctx, meta.Md5); ok || err1 != nil {
return
}
if conf.UCloudPath == "" {
err = gerror.New("UCloud存储驱动必须配置存储路径!")
return
@@ -194,26 +205,26 @@ func (s *sCommonUpload) UploadUCloud(ctx context.Context, conf *model.UploadConf
Endpoint: conf.UCloudEndpoint,
VerifyUploadMD5: false,
}
req, err := ufile.NewFileRequest(config, nil)
if err != nil {
return nil, err
return
}
// 流式上传本地小文件
f2, err := file.Open()
defer func() {
_ = f2.Close()
}()
defer f2.Close()
if err != nil {
return nil, err
return
}
if err = req.IOPut(f2, fullPath, ""); err != nil {
return nil, err
return
}
attachment, err := service.SysAttachment().Add(ctx, meta, fullPath, consts.UploadDriveUCloud)
if err != nil {
return nil, err
return
}
attachment.FileUrl = s.LastUrl(ctx, conf, attachment.FileUrl, attachment.Drive)
@@ -226,10 +237,6 @@ func (s *sCommonUpload) UploadUCloud(ctx context.Context, conf *model.UploadConf
// UploadCOS 上传腾讯云对象存储
func (s *sCommonUpload) UploadCOS(ctx context.Context, conf *model.UploadConfig, file *ghttp.UploadFile, meta *sysin.UploadFileMeta) (result *sysin.AttachmentListModel, err error) {
if ok, err1 := s.HasFile(ctx, meta.Md5); ok || err1 != nil {
return
}
if conf.CosPath == "" {
err = gerror.New("COS存储驱动必须配置存储路径!")
return
@@ -243,11 +250,9 @@ func (s *sCommonUpload) UploadCOS(ctx context.Context, conf *model.UploadConfig,
// 流式上传本地小文件
f2, err := file.Open()
defer func() {
_ = f2.Close()
}()
defer f2.Close()
if err != nil {
return nil, err
return
}
u, _ := url.Parse(conf.CosBucketURL)
@@ -259,14 +264,13 @@ func (s *sCommonUpload) UploadCOS(ctx context.Context, conf *model.UploadConfig,
},
})
_, err = c.Object.Put(ctx, fullPath, f2, nil)
if err != nil {
return nil, err
if _, err = c.Object.Put(ctx, fullPath, f2, nil); err != nil {
return
}
attachment, err := service.SysAttachment().Add(ctx, meta, fullPath, consts.UploadDriveCos)
if err != nil {
return nil, err
return
}
attachment.FileUrl = s.LastUrl(ctx, conf, attachment.FileUrl, attachment.Drive)
@@ -279,10 +283,6 @@ func (s *sCommonUpload) UploadCOS(ctx context.Context, conf *model.UploadConfig,
// UploadOSS 上传阿里云云对象存储
func (s *sCommonUpload) UploadOSS(ctx context.Context, conf *model.UploadConfig, file *ghttp.UploadFile, meta *sysin.UploadFileMeta) (result *sysin.AttachmentListModel, err error) {
if ok, err1 := s.HasFile(ctx, meta.Md5); ok || err1 != nil {
return
}
if conf.OssPath == "" {
err = gerror.New("OSS存储驱动必须配置存储路径!")
return
@@ -296,30 +296,28 @@ func (s *sCommonUpload) UploadOSS(ctx context.Context, conf *model.UploadConfig,
// 流式上传本地小文件
f2, err := file.Open()
defer func() {
_ = f2.Close()
}()
defer f2.Close()
if err != nil {
return nil, err
return
}
client, err := oss.New(conf.OssEndpoint, conf.OssSecretId, conf.OssSecretKey)
if err != nil {
return nil, err
return
}
bucket, err := client.Bucket(conf.OssBucket)
if err != nil {
return nil, err
return
}
if err = bucket.PutObject(fullPath, f2); err != nil {
return nil, err
return
}
attachment, err := service.SysAttachment().Add(ctx, meta, fullPath, consts.UploadDriveOss)
if err != nil {
return nil, err
return
}
attachment.FileUrl = s.LastUrl(ctx, conf, attachment.FileUrl, attachment.Drive)
@@ -332,10 +330,6 @@ func (s *sCommonUpload) UploadOSS(ctx context.Context, conf *model.UploadConfig,
// UploadQiNiu 上传七牛云对象存储
func (s *sCommonUpload) UploadQiNiu(ctx context.Context, conf *model.UploadConfig, file *ghttp.UploadFile, meta *sysin.UploadFileMeta) (result *sysin.AttachmentListModel, err error) {
if ok, err1 := s.HasFile(ctx, meta.Md5); ok || err1 != nil {
return
}
if conf.QiNiuPath == "" {
err = gerror.New("七牛云存储驱动必须配置存储路径!")
return
@@ -349,11 +343,9 @@ func (s *sCommonUpload) UploadQiNiu(ctx context.Context, conf *model.UploadConfi
// 流式上传本地小文件
f2, err := file.Open()
defer func() {
_ = f2.Close()
}()
defer f2.Close()
if err != nil {
return nil, err
return
}
putPolicy := storage.PutPolicy{
@@ -362,10 +354,13 @@ func (s *sCommonUpload) UploadQiNiu(ctx context.Context, conf *model.UploadConfi
token := putPolicy.UploadToken(qbox.NewMac(conf.QiNiuAccessKey, conf.QiNiuSecretKey))
cfg := storage.Config{}
// 是否使用https域名
cfg.UseHTTPS = true
// 上传是否使用CDN上传加速
cfg.UseCdnDomains = false
// 空间对应的机房
cfg.Region, err = storage.GetRegion(conf.QiNiuAccessKey, conf.QiNiuBucket)
if err != nil {
@@ -378,7 +373,7 @@ func (s *sCommonUpload) UploadQiNiu(ctx context.Context, conf *model.UploadConfi
attachment, err := service.SysAttachment().Add(ctx, meta, fullPath, consts.UploadDriveQiNiu)
if err != nil {
return nil, err
return
}
attachment.FileUrl = s.LastUrl(ctx, conf, attachment.FileUrl, attachment.Drive)
@@ -412,13 +407,9 @@ func (s *sCommonUpload) LastUrl(ctx context.Context, conf *model.UploadConfig, f
}
// HasFile 文件是否存在
func (s *sCommonUpload) HasFile(ctx context.Context, md5 string) (bool, error) {
result, err := dao.SysAttachment.GetMd5File(ctx, md5)
if err != nil {
return false, err
}
return result != nil, nil
func (s *sCommonUpload) HasFile(ctx context.Context, md5 string) (res *sysin.AttachmentListModel, err error) {
res, err = dao.SysAttachment.GetMd5File(ctx, md5)
return
}
// fileMeta 上传文件元数据

156
server/internal/logic/common/wechat.go Normal file
View File

@@ -0,0 +1,156 @@
// Package common
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
package common
import (
"context"
"fmt"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gcron"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/util/gmeta"
"hotgo/api/admin/common"
"hotgo/internal/consts"
"hotgo/internal/library/cache"
"hotgo/internal/library/contexts"
"hotgo/internal/library/jwt"
"hotgo/internal/library/response"
"hotgo/internal/library/wechat"
"hotgo/internal/model/input/commonin"
"hotgo/internal/service"
"time"
)
type sCommonWechat struct {
temp map[string]*AuthorizeCallState
}
// AuthorizeCallState 微信授权回调参数
type AuthorizeCallState struct {
State string `json:"state" dc:"state"`
MemberId int64 `json:"memberId" dc:"管理员ID"`
Type string `json:"type" dc:"授权类型"`
SyncRedirect string `json:"syncRedirect" dc:"同步跳转地址"`
Tick *gtime.Time `json:"tick" dc:"标记授权时间"`
}
func NewCommonWechat() *sCommonWechat {
return &sCommonWechat{
temp: make(map[string]*AuthorizeCallState),
}
}
func init() {
serv := NewCommonWechat()
service.RegisterCommonWechat(serv)
gcron.Add(gctx.New(), "@every 300s", serv.CleanTempMap, "WechatCleanTempMap")
}
// Authorize 微信用户授权
func (s *sCommonWechat) Authorize(ctx context.Context, in commonin.WechatAuthorizeInp) (res *commonin.WechatAuthorizeModel, err error) {
basic, err := service.SysConfig().GetBasic(ctx)
if err != nil {
return
}
var (
request = g.RequestFromCtx(ctx)
prefix = g.Cfg().MustGet(ctx, "router.admin.prefix", "/admin").String()
path = gmeta.Get(common.WechatAuthorizeCallReq{}, "path").String()
redirectUri = basic.Domain + prefix + path
memberId = contexts.GetUserId(ctx)
state = s.GetCacheKey(in.Type, jwt.GenAuthKey(jwt.GetAuthorization(request)))
scope string
)
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
return
}
switch in.Type {
case consts.WechatAuthorizeOpenId: // 设置openid
scope = consts.WechatScopeBase
case consts.WechatAuthorizeBindLogin: // 绑定微信登录
scope = consts.WechatScopeUserinfo
default:
err = gerror.New("无效的授权方式！")
return
}
url, err := wechat.GetOauthURL(ctx, redirectUri, scope, state)
if err != nil {
return
}
s.temp[state] = &AuthorizeCallState{
State: state,
MemberId: memberId,
Type: in.Type,
SyncRedirect: in.SyncRedirect,
Tick: gtime.Now(),
}
response.Redirect(g.RequestFromCtx(ctx), url)
return
}
func (s *sCommonWechat) AuthorizeCall(ctx context.Context, in commonin.WechatAuthorizeCallInp) (res *commonin.WechatAuthorizeCallModel, err error) {
data, ok := s.temp[in.State]
if !ok || data == nil {
err = gerror.New("授权无效或已过期，请重试")
return
}
defer delete(s.temp, in.State)
token, err := wechat.GetUserAccessToken(ctx, in.Code)
if err != nil {
return
}
switch data.Type {
case consts.WechatAuthorizeOpenId: // 设置openid
cache.Instance().Set(ctx, data.State, token.OpenID, time.Hour*24*7)
case consts.WechatAuthorizeBindLogin: // 绑定微信登录
// ...
default:
err = gerror.New("无效的授权方式！")
return
}
response.Redirect(g.RequestFromCtx(ctx), data.SyncRedirect)
return
}
// GetOpenId 从缓存中获取临时openid
func (s *sCommonWechat) GetOpenId(ctx context.Context) (openId string, err error) {
request := ghttp.RequestFromCtx(ctx)
key := s.GetCacheKey(consts.WechatAuthorizeOpenId, jwt.GenAuthKey(jwt.GetAuthorization(request)))
date, err := cache.Instance().Get(ctx, key)
if err != nil {
err = gerror.Newf("GetOpenId err:%+v", err.Error())
return
}
openId = date.String()
return
}
func (s *sCommonWechat) GetCacheKey(typ, ak string) string {
return fmt.Sprintf("%v:%v", typ, ak)
}
// CleanTempMap 清理临时map
func (s *sCommonWechat) CleanTempMap(ctx context.Context) {
t := gtime.Now().Add(time.Second * 600)
for _, state := range s.temp {
if state.Tick.After(t) {
delete(s.temp, state.State)
}
}
}

9
server/internal/logic/hook/access_log.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package hook
import (
@@ -21,14 +20,16 @@ func (s *sHook) accessLog(r *ghttp.Request) {
if r.IsFileRequest() {
return
}
var ctx = r.Context()
var ctx = contexts.Detach(r.Context())
modelCtx := contexts.Get(ctx)
if modelCtx == nil {
return
}
// 计算运行耗时
contexts.SetTakeUpTime(ctx, gtime.TimestampMilli()-r.EnterTime)
contexts.SetDataMap(ctx, g.Map{
"request.takeUpTime": gtime.TimestampMilli() - r.EnterTime,
// ...
})
simple.SafeGo(ctx, func(ctx context.Context) {
if err := service.SysLog().AutoLog(ctx); err != nil {

5
server/internal/logic/hook/init.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package hook
import (
@@ -22,6 +21,10 @@ func New() *sHook {
return &sHook{}
}
func (s *sHook) BeforeServe(r *ghttp.Request) {
}
func (s *sHook) AfterOutput(r *ghttp.Request) {
s.accessLog(r)
s.lastAdminActive(r)

5
server/internal/logic/hook/last_active.go
View File

@@ -66,7 +66,7 @@ func (s *sHook) lastAdminActive(r *ghttp.Request) {
}
var (
ctx = r.Context()
ctx = contexts.Detach(r.Context())
member = contexts.GetUser(ctx)
)
@@ -76,7 +76,8 @@ func (s *sHook) lastAdminActive(r *ghttp.Request) {
if allow(member.Id) {
simple.SafeGo(ctx, func(ctx context.Context) {
_, err := g.Model("admin_member").Ctx(ctx).
_, err := g.Model("admin_member").
Ctx(ctx).
Where("id", member.Id).
WhereLT("last_active_at", gtime.Now()).
Data(g.Map{"last_active_at": gtime.Now()}).

1
server/internal/logic/logic.go
View File

@@ -9,6 +9,7 @@ import (
_ "hotgo/internal/logic/common"
_ "hotgo/internal/logic/hook"
_ "hotgo/internal/logic/middleware"
_ "hotgo/internal/logic/pay"
_ "hotgo/internal/logic/sys"
_ "hotgo/internal/logic/tcpclient"
_ "hotgo/internal/logic/tcpserver"

48
server/internal/logic/middleware/init.go
View File

@@ -7,6 +7,7 @@ package middleware
import (
"github.com/gogf/gf/v2/crypto/gmd5"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
@@ -26,8 +27,9 @@ import (
)
type sMiddleware struct {
LoginUrl string // 登录路由地址
DemoWhiteList g.Map // 演示模式放行的路由白名單
LoginUrl string // 登录路由地址
DemoWhiteList g.Map // 演示模式放行的路由白名单
PayNotifyRoutes g.Map // 支付异步通知路由
}
func init() {
@@ -41,6 +43,11 @@ func New() *sMiddleware {
"/admin/site/login": struct{}{}, // 后台登录
"/admin/genCodes/preview": struct{}{}, // 预览代码
},
PayNotifyRoutes: g.Map{
"/api/pay/notify/alipay": struct{}{}, // 支付宝
"/api/pay/notify/wxpay": struct{}{}, // 微信支付
"/api/pay/notify/qqpay": struct{}{}, // QQ支付
},
}
}
@@ -51,6 +58,7 @@ func (s *sMiddleware) Ctx(r *ghttp.Request) {
Module: getModule(r.URL.Path),
})
contexts.SetData(r.Context(), "request.body", gjson.New(r.GetBodyString()))
r.Middleware.Next()
}
@@ -117,7 +125,7 @@ func (s *sMiddleware) Addon(r *ghttp.Request) {
}
// inspectAuth 检查并完成身份认证
func inspectAuth(r *ghttp.Request, appName string) error {
func inspectAuth(r *ghttp.Request, appName string) (err error) {
var (
ctx = r.Context()
user = new(model.Identity)
@@ -126,30 +134,35 @@ func inspectAuth(r *ghttp.Request, appName string) error {
)
if authorization == "" {
return gerror.New("请先登录！")
err = gerror.New("请先登录！")
return
}
// 获取jwtToken
jwtToken := consts.CacheJwtToken + gmd5.MustEncryptString(authorization)
jwtSign := g.Cfg().MustGet(ctx, "jwt.sign", "hotgo")
data, ParseErr := jwt.ParseToken(authorization, jwtSign.Bytes())
if ParseErr != nil {
return gerror.Newf("token不正确或已过期! err :%+v", ParseErr.Error())
data, parseErr := jwt.ParseToken(authorization, jwtSign.Bytes())
if parseErr != nil {
err = gerror.Newf("token不正确或已过期! err :%+v", parseErr.Error())
return
}
parseErr := gconv.Struct(data, &user)
if parseErr != nil {
return gerror.Newf("登录信息解析异常，请重新登录！ err :%+v", ParseErr.Error())
if parseErr = gconv.Struct(data, &user); parseErr != nil {
err = gerror.Newf("登录信息解析异常，请重新登录！ err :%+v", parseErr.Error())
return
}
// 判断token跟redis的缓存的token是否一样
isContains, containsErr := cache.Instance().Contains(ctx, jwtToken)
if containsErr != nil {
return gerror.Newf("token无效！ err :%+v", ParseErr.Error())
err = gerror.Newf("token无效！ err :%+v", containsErr.Error())
return
}
if !isContains {
return gerror.Newf("token已过期")
err = gerror.Newf("token已过期")
return
}
// 是否开启多端登录
@@ -157,15 +170,18 @@ func inspectAuth(r *ghttp.Request, appName string) error {
key := consts.CacheJwtUserBind + appName + ":" + gconv.String(user.Id)
originJwtToken, originErr := cache.Instance().Get(ctx, key)
if originErr != nil {
return gerror.Newf("信息异常，请重新登录！ err :%+v", originErr.Error())
err = gerror.Newf("信息异常，请重新登录！ err :%+v", originErr.Error())
return
}
if originJwtToken == nil || originJwtToken.IsEmpty() {
return gerror.New("token已过期！")
err = gerror.New("token已过期！")
return
}
if jwtToken != originJwtToken.String() {
return gerror.New("账号已在其他地方登录！")
err = gerror.New("账号已在其他地方登录！")
return
}
}
@@ -188,5 +204,5 @@ func inspectAuth(r *ghttp.Request, appName string) error {
}
}
contexts.SetUser(ctx, customCtx.User)
return nil
return
}

2
server/internal/logic/middleware/limit_develop.go
View File

@@ -15,6 +15,7 @@ func (s *sMiddleware) Develop(r *ghttp.Request) {
ips := g.Cfg().MustGet(r.Context(), "hggen.allowedIPs").Strings()
if len(ips) == 0 {
response.JsonExit(r, gcode.CodeNotSupported.Code(), "请配置生成白名单！")
return
}
if !gstr.InArray(ips, "*") {
@@ -29,6 +30,7 @@ func (s *sMiddleware) Develop(r *ghttp.Request) {
if !ok {
response.JsonExit(r, gcode.CodeNotSupported.Code(), fmt.Sprintf("当前IP[%s]没有配置生成白名单！", cuIp))
return
}
}

73
server/internal/logic/middleware/response.go
View File

@@ -3,16 +3,19 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package middleware
import (
"fmt"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/consts"
"hotgo/internal/library/contexts"
"hotgo/internal/library/response"
"hotgo/internal/model/input/payin"
"hotgo/utility/charset"
)
@@ -20,6 +23,68 @@ import (
func (s *sMiddleware) ResponseHandler(r *ghttp.Request) {
r.Middleware.Next()
// 模板页面响应
if "text/html" == r.Response.Header().Get("Content-Type") {
r.Middleware.Next()
return
}
// 支付通知响应
if _, ok := s.PayNotifyRoutes[r.Router.Uri]; ok {
s.responsePayNotify(r)
return
}
responseJson(r)
}
// rTemplate 支付通知响应
func (s *sMiddleware) responsePayNotify(r *ghttp.Request) {
var (
ctx = r.Context()
err error
data *payin.PayNotifyModel
)
// 异常
if err = r.GetError(); err != nil {
g.Log("exception").Error(ctx, err)
r.Response.ClearBuffer()
r.Response.WriteStatus(500, err.Error())
return
}
if err = gconv.Scan(r.GetHandlerResponse(), &data); err != nil || data == nil {
g.Log("exception").Errorf(ctx, "middleware.responsePayNotify Scan err:%+v, data:%+v", err, data)
r.Response.ClearBuffer()
r.Response.WriteStatus(500, err.Error())
return
}
switch data.PayType {
case consts.PayTypeAliPay:
response.RText(r, data.Message)
case consts.PayTypeWxPay:
r.Response.ClearBuffer()
r.Response.WriteJson(fmt.Sprintf(`{"code": "%v","message": "%v"}`, data.Code, data.Message))
case consts.PayTypeQQPay:
r.Response.ClearBuffer()
r.Response.Write(`<?xml version="1.0" encoding="UTF-8"?>`)
r.Response.WriteXml(g.Map{
"return_code": data.Message,
})
default:
err = gerror.Newf("无效的支付方式，这可能是没有配置通知回调响应方式导致的：%+v", data)
g.Log("exception").Error(ctx, err)
r.Response.ClearBuffer()
r.Response.WriteStatus(500, err.Error())
}
}
func responseJson(r *ghttp.Request) {
var (
ctx = r.Context()
comResponse = contexts.Get(ctx).Response
@@ -29,12 +94,6 @@ func (s *sMiddleware) ResponseHandler(r *ghttp.Request) {
err error
)
// 模板页面响应
if "text/html" == r.Response.Header().Get("Content-Type") {
r.Middleware.Next()
return
}
// 已存在响应内容，且是comResponse返回的时，中断运行
if r.Response.BufferLength() > 0 && comResponse != nil {
return

141
server/internal/logic/pay/create.go Normal file
View File

@@ -0,0 +1,141 @@
package pay
// 订单创建
import (
"context"
"fmt"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/util/gmeta"
"hotgo/api/api/pay"
"hotgo/internal/consts"
"hotgo/internal/library/contexts"
"hotgo/internal/library/location"
"hotgo/internal/library/payment"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/payin"
"hotgo/internal/service"
"hotgo/utility/validate"
)
// Create 创建支付订单和日志
func (s *sPay) Create(ctx context.Context, in payin.PayCreateInp) (res *payin.PayCreateModel, err error) {
request := ghttp.RequestFromCtx(ctx)
if in.TradeType == "" {
in.TradeType = payment.AutoTradeType(in.PayType, request.UserAgent())
}
if in.Openid == "" {
if in.Openid, err = service.CommonWechat().GetOpenId(ctx); err != nil {
return
}
}
if in.TradeType == consts.TradeTypeWxMP {
if in.Openid == "" {
err = gerror.New("微信公众号支付必须设置openid")
return
}
if in.ReturnUrl == "" {
err = gerror.New("微信公众号支付必须设置同步通知地址")
return
}
}
notifyURL, err := s.GenNotifyURL(ctx, in)
if err != nil {
return
}
config := payment.GetConfig()
mchId := ""
switch in.PayType {
case consts.PayTypeAliPay:
mchId = config.AliPayAppId
case consts.PayTypeWxPay:
mchId = config.WxPayMchId
case consts.PayTypeQQPay:
mchId = config.QQPayMchId
}
data := &entity.PayLog{
MemberId: contexts.GetUserId(ctx),
AppId: contexts.GetModule(ctx),
AddonsName: contexts.GetAddonName(ctx),
OrderSn: in.OrderSn,
OrderGroup: in.OrderGroup,
Openid: in.Openid,
MchId: mchId,
Subject: in.Subject,
Detail: in.Detail,
OutTradeNo: payment.GenOutTradeNo(),
TransactionId: "",
PayType: in.PayType,
PayAmount: in.PayAmount,
PayStatus: consts.PayStatusWait,
TradeType: in.TradeType,
IsRefund: consts.RefundStatusNo,
CreateIp: location.GetClientIp(request),
NotifyUrl: notifyURL,
ReturnUrl: in.ReturnUrl,
TraceIds: gjson.New([]string{gctx.CtxId(ctx)}),
Status: consts.StatusEnabled,
}
// 创建支付记录
if _, err = s.Model(ctx).Data(data).Insert(); err != nil {
return
}
// 创建第三方平台支付订单
order, err := payment.New(in.PayType).CreateOrder(ctx, payin.CreateOrderInp{Pay: data})
if err != nil {
return
}
res = new(payin.PayCreateModel)
res.Order = order
return
}
// GenNotifyURL 生成支付通知地址
func (s *sPay) GenNotifyURL(ctx context.Context, in payin.PayCreateInp) (notifyURL string, err error) {
basic, err := service.SysConfig().GetBasic(ctx)
if err != nil {
return
}
if basic.Domain == "" {
err = gerror.New("请先到后台【系统设置】-【配置管理】中设置网站域名！")
return
}
if !validate.IsURL(basic.Domain) {
err = gerror.New("网站域名格式有误，请检查！")
return
}
var object interface{}
switch in.PayType {
case consts.PayTypeAliPay:
object = pay.NotifyAliPayReq{}
case consts.PayTypeWxPay:
object = pay.NotifyWxPayReq{}
case consts.PayTypeQQPay:
object = pay.NotifyQQPayReq{}
default:
err = gerror.Newf("未被支持的支付方式：%v", in.PayType)
return
}
notifyURL = fmt.Sprintf("%s%s%s",
basic.Domain,
g.Cfg().MustGet(ctx, "router.api.prefix", "/api").String(),
gmeta.Get(object, "path").String(),
)
return
}

85
server/internal/logic/pay/notify.go Normal file
View File

@@ -0,0 +1,85 @@
package pay
// 异步通知
import (
"context"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gctx"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/location"
"hotgo/internal/library/payment"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/payin"
)
// Notify 异步通知
func (s *sPay) Notify(ctx context.Context, in payin.PayNotifyInp) (res *payin.PayNotifyModel, err error) {
data, err := payment.New(in.PayType).Notify(ctx, payin.NotifyInp{})
if err != nil {
return
}
var models *entity.PayLog
if err = s.Model(ctx).Where(dao.PayLog.Columns().OutTradeNo, data.OutTradeNo).Scan(&models); err != nil {
return
}
if models == nil {
err = gerror.Newf("商户订单号[%v]不存在支付记录，请检查", data.OutTradeNo)
return
}
if models.PayStatus != consts.PayStatusWait {
err = gerror.Newf("商户订单号[%v]已被处理，请勿重复操作", data.OutTradeNo)
return
}
var traceIds []string
if err = models.TraceIds.Scan(&traceIds); err != nil {
return
}
traceIds = append(traceIds, gctx.CtxId(ctx))
models.TransactionId = data.TransactionId
models.PayStatus = consts.PayStatusOk
models.PayAt = data.PayAt
models.ActualAmount = data.ActualAmount
models.PayIp = location.GetClientIp(ghttp.RequestFromCtx(ctx))
models.TraceIds = gjson.New(traceIds)
result, err := s.Model(ctx).
Fields(
dao.PayLog.Columns().TransactionId,
dao.PayLog.Columns().PayStatus,
dao.PayLog.Columns().PayAt,
dao.PayLog.Columns().PayIp,
dao.PayLog.Columns().TraceIds,
dao.PayLog.Columns().ActualAmount,
).
Where(dao.PayLog.Columns().Id, models.Id).
Where(dao.PayLog.Columns().PayStatus, consts.PayStatusWait).
OmitEmpty().
Data(models).Update()
if err != nil {
return
}
ret, err := result.RowsAffected()
if err != nil {
return
}
if ret == 0 {
g.Log().Warningf(ctx, "没有被更新的数据行")
return
}
// 回调业务
payment.NotifyCall(ctx, payin.NotifyCallFuncInp{Pay: models})
return
}

155
server/internal/logic/pay/pay.go Normal file
View File

@@ -0,0 +1,155 @@
// Package pay
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
package pay
// 支付日志相关
import (
"context"
"fmt"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/hgorm/handler"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/payin"
"hotgo/internal/service"
"hotgo/utility/convert"
"hotgo/utility/excel"
"hotgo/utility/validate"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/util/gconv"
)
type sPay struct{}
func NewPay() *sPay {
return &sPay{}
}
func init() {
service.RegisterPay(NewPay())
}
// Model 支付日志ORM模型
func (s *sPay) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
return handler.Model(dao.PayLog.Ctx(ctx), option...)
}
// List 获取支付日志列表
func (s *sPay) List(ctx context.Context, in payin.PayListInp) (list []*payin.PayListModel, totalCount int, err error) {
mod := s.Model(ctx)
// 查询ID
if in.Id > 0 {
mod = mod.Where(dao.PayLog.Columns().Id, in.Id)
}
// 查询状态
if in.Status > 0 {
mod = mod.Where(dao.PayLog.Columns().Status, in.Status)
}
// 查询创建时间
if len(in.CreatedAt) == 2 {
mod = mod.WhereBetween(dao.PayLog.Columns().CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
}
// 查询分类名称
if in.TestCategoryName != "" {
mod = mod.WhereLike(dao.TestCategory.Columns().Name, in.TestCategoryName)
}
totalCount, err = mod.Clone().Count()
if err != nil {
return
}
if totalCount == 0 {
return
}
err = mod.Page(in.Page, in.PerPage).OrderDesc(dao.PayLog.Columns().Id).Scan(&list)
return
}
// Export 导出支付日志
func (s *sPay) Export(ctx context.Context, in payin.PayListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return
}
// 字段的排序是依据tags的字段顺序，如果你不想使用默认的排序方式，可以直接定义 tags = []string{"字段名称", "字段名称2", ...}
tags, err := convert.GetEntityDescTags(payin.PayExportModel{})
if err != nil {
return
}
var (
fileName = "导出支付日志-" + gctx.CtxId(ctx) + ".xlsx"
sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
exports []payin.PayExportModel
)
if err = gconv.Scan(list, &exports); err != nil {
return
}
err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
return
}
// Edit 修改/新增支付日志
func (s *sPay) Edit(ctx context.Context, in payin.PayEditInp) (err error) {
// 修改
if in.Id > 0 {
_, err = s.Model(ctx).Where(dao.PayLog.Columns().Id, in.Id).Data(in).Update()
return
}
// 新增
_, err = s.Model(ctx, &handler.Option{FilterAuth: false}).Data(in).Insert()
return
}
// Delete 删除支付日志
func (s *sPay) Delete(ctx context.Context, in payin.PayDeleteInp) (err error) {
_, err = s.Model(ctx).Where(dao.PayLog.Columns().Id, in.Id).Delete()
return
}
// View 获取支付日志指定信息
func (s *sPay) View(ctx context.Context, in payin.PayViewInp) (res *payin.PayViewModel, err error) {
err = s.Model(ctx).Where(dao.PayLog.Columns().Id, in.Id).Scan(&res)
return
}
// Status 更新支付日志状态
func (s *sPay) Status(ctx context.Context, in payin.PayStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return
}
_, err = s.Model(ctx).Where(dao.PayLog.Columns().Id, in.Id).Data(g.Map{
dao.PayLog.Columns().Status: in.Status,
}).Update()
return
}

225
server/internal/logic/pay/refund.go Normal file
View File

@@ -0,0 +1,225 @@
// Package pay
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
// @AutoGenerate Version 2.5.3
// @AutoGenerate Date 2023-04-15 15:59:58
package pay
import (
"context"
"fmt"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/hgorm"
"hotgo/internal/library/hgorm/handler"
"hotgo/internal/library/location"
"hotgo/internal/library/payment"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/payin"
"hotgo/internal/service"
"hotgo/utility/convert"
"hotgo/utility/excel"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/util/gconv"
)
// 订单退款.
type sPayRefund struct{}
func NewPayRefund() *sPayRefund {
return &sPayRefund{}
}
func init() {
service.RegisterPayRefund(NewPayRefund())
}
// Model 交易退款ORM模型
func (s *sPayRefund) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
return handler.Model(dao.PayRefund.Ctx(ctx), option...)
}
// Refund 订单退款
func (s *sPayRefund) Refund(ctx context.Context, in payin.PayRefundInp) (res *payin.PayRefundModel, err error) {
var models *entity.PayLog
if err = service.Pay().Model(ctx).Where(dao.PayLog.Columns().OrderSn, in.OrderSn).Scan(&models); err != nil {
return
}
if models == nil {
err = gerror.Newf("业务订单号[%v]不存在支付记录，请检查", in.OrderSn)
return
}
if models.PayStatus != consts.PayStatusOk {
err = gerror.Newf("业务订单号[%v]未支付，无需退款", in.OrderSn)
return
}
if models.IsRefund != consts.RefundStatusNo {
err = gerror.Newf("业务订单号[%v]退款已被处理，请勿重复操作", in.OrderSn)
return
}
var traceIds []string
if err = models.TraceIds.Scan(&traceIds); err != nil {
return
}
traceIds = append(traceIds, gctx.CtxId(ctx))
refundSn := payment.GenRefundSn()
// 创建第三方平台退款
req := payin.RefundInp{
Pay: models,
RefundMoney: in.RefundMoney,
Reason: in.Reason,
Remark: in.Remark,
RefundSn: refundSn,
}
if _, err = payment.New(models.PayType).Refund(ctx, req); err != nil {
return
}
models.RefundSn = refundSn
models.IsRefund = consts.RefundStatusAgree
models.TraceIds = gjson.New(traceIds)
result, err := s.Model(ctx).
Fields(
dao.PayLog.Columns().RefundSn,
dao.PayLog.Columns().IsRefund,
dao.PayLog.Columns().TraceIds,
).
Where(dao.PayLog.Columns().Id, models.Id).
OmitEmpty().
Data(models).Update()
if err != nil {
return
}
ret, err := result.RowsAffected()
if err != nil {
return
}
if ret == 0 {
g.Log().Warningf(ctx, "Refund 没有被更新的数据行")
}
data := &entity.PayRefund{
Id: 0,
MemberId: models.MemberId,
AppId: models.AppId,
OrderSn: models.OrderSn,
RefundTradeNo: "",
RefundMoney: in.RefundMoney,
RefundWay: 1,
Ip: location.GetClientIp(ghttp.RequestFromCtx(ctx)),
Reason: in.Reason,
Remark: in.Remark,
Status: consts.RefundStatusAgree,
}
// 创建退款记录
if _, err = s.Model(ctx).Data(data).Insert(); err != nil {
return
}
return
}
// List 获取交易退款列表
func (s *sPayRefund) List(ctx context.Context, in payin.PayRefundListInp) (list []*payin.PayRefundListModel, totalCount int, err error) {
mod := s.Model(ctx)
// 查询变动ID
if in.Id > 0 {
mod = mod.Where(dao.PayRefund.Columns().Id, in.Id)
}
// 查询管理员ID
if in.MemberId > 0 {
mod = mod.Where(dao.PayRefund.Columns().MemberId, in.MemberId)
}
// 查询应用id
if in.AppId != "" {
mod = mod.WhereLike(dao.PayRefund.Columns().AppId, in.AppId)
}
// 查询备注
if in.Remark != "" {
mod = mod.WhereLike(dao.PayRefund.Columns().Remark, in.Remark)
}
// 查询操作人IP
if in.Ip != "" {
mod = mod.WhereLike(dao.PayRefund.Columns().Ip, in.Ip)
}
// 查询状态
if in.Status > 0 {
mod = mod.Where(dao.PayRefund.Columns().Status, in.Status)
}
// 查询创建时间
if len(in.CreatedAt) == 2 {
mod = mod.WhereBetween(dao.PayRefund.Columns().CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
}
totalCount, err = mod.Clone().Count(1)
if err != nil {
return
}
if totalCount == 0 {
return
}
fields, err := hgorm.GenSelect(ctx, payin.PayRefundListModel{}, dao.PayRefund)
if err != nil {
return
}
err = mod.Fields(fields).Page(in.Page, in.PerPage).OrderDesc(dao.PayRefund.Columns().Id).Scan(&list)
return
}
// Export 导出交易退款
func (s *sPayRefund) Export(ctx context.Context, in payin.PayRefundListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return
}
// 字段的排序是依据tags的字段顺序，如果你不想使用默认的排序方式，可以直接定义 tags = []string{"字段名称", "字段名称2", ...}
tags, err := convert.GetEntityDescTags(payin.PayRefundExportModel{})
if err != nil {
return
}
var (
fileName = "导出交易退款-" + gctx.CtxId(ctx) + ".xlsx"
sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
exports []payin.PayRefundExportModel
)
if err = gconv.Scan(list, &exports); err != nil {
return
}
err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
return
}

4
server/internal/logic/sys/addons.go
View File

@@ -113,9 +113,9 @@ func (s *sSysAddons) Selects(ctx context.Context, in sysin.AddonsSelectsInp) (re
Label: v,
})
}
sort.Sort(res.Status)
return res, nil
sort.Sort(res.Status)
return
}
// Build 提交生成

29
server/internal/logic/sys/addons_config.go
View File

@@ -34,11 +34,15 @@ func init() {
// GetConfigByGroup 获取指定分组的配置
func (s *sSysAddonsConfig) GetConfigByGroup(ctx context.Context, in sysin.GetAddonsConfigInp) (res *sysin.GetAddonsConfigModel, err error) {
if in.AddonName == "" {
return nil, gerror.New("插件名称不能为空")
err = gerror.New("插件名称不能为空")
return
}
if in.Group == "" {
return nil, gerror.New("分组不能为空")
err = gerror.New("分组不能为空")
return
}
var (
mod = dao.SysAddonsConfig.Ctx(ctx)
models []*entity.SysAddonsConfig
@@ -67,37 +71,44 @@ func (s *sSysAddonsConfig) GetConfigByGroup(ctx context.Context, in sysin.GetAdd
}
}
}
return
}
// ConversionType 转换类型
func (s *sSysAddonsConfig) ConversionType(ctx context.Context, models *entity.SysAddonsConfig) (value interface{}, err error) {
if models == nil {
return nil, gerror.New("数据不存在")
err = gerror.New("数据不存在")
return
}
return consts.ConvType(models.Value, models.Type), nil
}
// UpdateConfigByGroup 更新指定分组的配置
func (s *sSysAddonsConfig) UpdateConfigByGroup(ctx context.Context, in sysin.UpdateAddonsConfigInp) error {
func (s *sSysAddonsConfig) UpdateConfigByGroup(ctx context.Context, in sysin.UpdateAddonsConfigInp) (err error) {
if in.AddonName == "" {
return gerror.New("插件名称不能为空")
err = gerror.New("插件名称不能为空")
return
}
if in.Group == "" {
return gerror.New("分组不能为空")
err = gerror.New("分组不能为空")
return
}
var (
mod = dao.SysAddonsConfig.Ctx(ctx)
models []*entity.SysAddonsConfig
)
if err := mod.
if err = mod.
Where("addon_name", in.AddonName).
Where("group", in.Group).
Scan(&models); err != nil {
return err
}
err := dao.SysAddonsConfig.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
err = dao.SysAddonsConfig.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
for k, v := range in.List {
row := s.getConfigByKey(k, models)
// 新增
@@ -119,7 +130,7 @@ func (s *sSysAddonsConfig) UpdateConfigByGroup(ctx context.Context, in sysin.Upd
}
// 更新
_, err := dao.SysAddonsConfig.Ctx(ctx).Where("id", row.Id).Data(g.Map{"value": v, "updated_at": gtime.Now()}).Update()
_, err = dao.SysAddonsConfig.Ctx(ctx).Where("id", row.Id).Data(g.Map{"value": v, "updated_at": gtime.Now()}).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err

103
server/internal/logic/sys/attachment.go
View File

@@ -3,17 +3,19 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
"context"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/os/gtime"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/contexts"
"hotgo/internal/library/hgorm/handler"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/sysin"
"hotgo/internal/service"
"hotgo/utility/format"
@@ -30,114 +32,90 @@ func init() {
service.RegisterSysAttachment(NewSysAttachment())
}
// Delete 删除
func (s *sSysAttachment) Delete(ctx context.Context, in sysin.AttachmentDeleteInp) error {
_, err := dao.SysAttachment.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
// Model ORM模型
func (s *sSysAttachment) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
return handler.Model(dao.SysAttachment.Ctx(ctx), option...)
}
return nil
// Delete 删除
func (s *sSysAttachment) Delete(ctx context.Context, in sysin.AttachmentDeleteInp) (err error) {
_, err = s.Model(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sSysAttachment) Edit(ctx context.Context, in sysin.AttachmentEditInp) (err error) {
if in.Name == "" {
err = gerror.New("标题不能为空")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
if in.Id > 0 {
_, err = dao.SysAttachment.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
_, err = s.Model(ctx).Where("id", in.Id).Data(in).Update()
return
}
// 新增
in.CreatedAt = gtime.Now()
_, err = dao.SysAttachment.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Status 更新部门状态
func (s *sSysAttachment) Status(ctx context.Context, in sysin.AttachmentStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
_, err = dao.SysAttachment.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
_, err = s.Model(ctx).Where("id", in.Id).Data("status", in.Status).Update()
return
}
// MaxSort 最大排序
func (s *sSysAttachment) MaxSort(ctx context.Context, in sysin.AttachmentMaxSortInp) (*sysin.AttachmentMaxSortModel, error) {
var res sysin.AttachmentMaxSortModel
func (s *sSysAttachment) MaxSort(ctx context.Context, in sysin.AttachmentMaxSortInp) (res *sysin.AttachmentMaxSortModel, err error) {
if in.Id > 0 {
if err := dao.SysAttachment.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
if err = s.Model(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
return
}
}
res.Sort = res.Sort + 10
return &res, nil
if res == nil {
res = new(sysin.AttachmentMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// View 获取指定字典类型信息
func (s *sSysAttachment) View(ctx context.Context, in sysin.AttachmentViewInp) (res *sysin.AttachmentViewModel, err error) {
if err = dao.SysAttachment.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = s.Model(ctx).Where("id", in.Id).Scan(&res)
return
}
// List 获取列表
func (s *sSysAttachment) List(ctx context.Context, in sysin.AttachmentListInp) (list []*sysin.AttachmentListModel, totalCount int, err error) {
mod := dao.SysAttachment.Ctx(ctx)
mod := s.Model(ctx)
// 访问路径
if in.MemberId > 0 {
mod = mod.Where("member_id", in.MemberId)
}
// 模块
if in.Drive != "" {
mod = mod.Where("drive", in.Drive)
}
// 请求方式
if in.Status > 0 {
mod = mod.Where("status", in.Status)
}
@@ -145,21 +123,21 @@ func (s *sSysAttachment) List(ctx context.Context, in sysin.AttachmentListInp) (
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
if err = mod.Page(in.Page, in.PerPage).Order("updated_at desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
conf, err := service.SysConfig().GetUpload(ctx)
if err != nil {
return list, totalCount, err
return
}
for _, v := range list {
@@ -167,21 +145,22 @@ func (s *sSysAttachment) List(ctx context.Context, in sysin.AttachmentListInp) (
v.FileUrl = service.CommonUpload().LastUrl(ctx, conf, v.FileUrl, v.Drive)
}
return list, totalCount, err
return
}
// Add 新增附件
func (s *sSysAttachment) Add(ctx context.Context, meta *sysin.UploadFileMeta, fullPath, drive string) (data *entity.SysAttachment, err error) {
func (s *sSysAttachment) Add(ctx context.Context, meta *sysin.UploadFileMeta, fullPath, drive string) (models *entity.SysAttachment, err error) {
var (
c = contexts.Get(ctx)
user = c.User
memberId int64 = 0
)
if user != nil {
memberId = user.Id
}
models := &entity.SysAttachment{
models = &entity.SysAttachment{
Id: 0,
AppId: c.Module,
MemberId: memberId,
@@ -201,9 +180,9 @@ func (s *sSysAttachment) Add(ctx context.Context, meta *sysin.UploadFileMeta, fu
}
id, err := dao.SysAttachment.Ctx(ctx).Data(models).InsertAndGetId()
if err != nil {
return nil, gerror.Wrap(err, consts.ErrorORM)
return
}
models.Id = id
return models, nil
return
}

74
server/internal/logic/sys/blacklist.go
View File

@@ -9,10 +9,10 @@ import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/global"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/sysin"
"hotgo/internal/service"
"hotgo/utility/convert"
@@ -33,12 +33,7 @@ func init() {
func (s *sSysBlacklist) Delete(ctx context.Context, in sysin.BlacklistDeleteInp) (err error) {
defer s.VariableLoad(ctx, err)
_, err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Edit 修改/新增
@@ -46,29 +41,18 @@ func (s *sSysBlacklist) Edit(ctx context.Context, in sysin.BlacklistEditInp) (er
defer s.VariableLoad(ctx, err)
if in.Ip == "" {
err = gerror.New("ip不能为空")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
if in.Id > 0 {
_, err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// 新增
in.CreatedAt = gtime.Now()
_, err = dao.SysBlacklist.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Status 更新部门状态
@@ -76,50 +60,44 @@ func (s *sSysBlacklist) Status(ctx context.Context, in sysin.BlacklistStatusInp)
defer s.VariableLoad(ctx, err)
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
_, err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// MaxSort 最大排序
func (s *sSysBlacklist) MaxSort(ctx context.Context, in sysin.BlacklistMaxSortInp) (*sysin.BlacklistMaxSortModel, error) {
var res sysin.BlacklistMaxSortModel
func (s *sSysBlacklist) MaxSort(ctx context.Context, in sysin.BlacklistMaxSortInp) (res *sysin.BlacklistMaxSortModel, err error) {
if in.Id > 0 {
if err := dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
if err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
return
}
}
res.Sort = res.Sort + 10
return &res, nil
if res == nil {
res = new(sysin.BlacklistMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// View 获取指定字典类型信息
func (s *sSysBlacklist) View(ctx context.Context, in sysin.BlacklistViewInp) (res *sysin.BlacklistViewModel, err error) {
if err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Scan(&res)
return
}
// List 获取列表
@@ -138,20 +116,18 @@ func (s *sSysBlacklist) List(ctx context.Context, in sysin.BlacklistListInp) (li
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
return list, totalCount, err
return
}
// VariableLoad 变化加载

207
server/internal/logic/sys/config.go
View File

@@ -16,12 +16,15 @@ import (
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/payment"
"hotgo/internal/library/wechat"
"hotgo/internal/model"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/sysin"
"hotgo/internal/service"
)
// MaskDemoField 演示环境下需要隐藏的配置
var MaskDemoField = []string{
// 邮箱
"smtpUser", "smtpPass",
@@ -34,10 +37,18 @@ var MaskDemoField = []string{
// 地图
"geoAmapWebKey",
// 短信
"smsAliYunAccessKeyID", "smsAliYunAccessKeySecret",
"smsTencentSecretId", "smsTencentSecretKey",
// 支付
"payWxPayMchId", "payWxPaySerialNo", "payWxPayAPIv3Key",
"payWxPayPrivateKey", "payQQPayMchId", "payQQPayApiKey",
// 微信
"officialAccountAppSecret", "officialAccountToken", "officialAccountEncodingAESKey",
"openPlatformAppSecret", "openPlatformToken", "openPlatformEncodingAESKey",
}
type sSysConfig struct{}
@@ -50,6 +61,27 @@ func init() {
service.RegisterSysConfig(NewSysConfig())
}
func (s *sSysConfig) InitConfig(ctx context.Context) {
wx, err := s.GetWechat(ctx)
if err != nil {
g.Log().Fatalf(ctx, "init wechat conifg fail：%+v", err)
}
wechat.SetConfig(wx)
pay, err := s.GetPay(ctx)
if err != nil {
g.Log().Fatalf(ctx, "init pay conifg fail：%+v", err)
}
payment.SetConfig(pay)
}
// GetLoadTCP 获取本地tcp配置
func (s *sSysConfig) GetLoadTCP(ctx context.Context) (conf *model.TCPConfig, err error) {
err = g.Cfg().MustGet(ctx, "tcp").Scan(&conf)
return
}
// GetLoadCache 获取本地缓存配置
func (s *sSysConfig) GetLoadCache(ctx context.Context) (conf *model.CacheConfig, err error) {
err = g.Cfg().MustGet(ctx, "cache").Scan(&conf)
@@ -58,120 +90,120 @@ func (s *sSysConfig) GetLoadCache(ctx context.Context) (conf *model.CacheConfig,
// GetLoadGenerate 获取本地生成配置
func (s *sSysConfig) GetLoadGenerate(ctx context.Context) (conf *model.GenerateConfig, err error) {
generate := g.Cfg().MustGet(ctx, "hggen")
if err = gconv.Struct(generate, &conf); err != nil {
return nil, err
}
err = g.Cfg().MustGet(ctx, "hggen").Scan(&conf)
return
}
return conf, nil
// GetWechat 获取微信配置
func (s *sSysConfig) GetWechat(ctx context.Context) (conf *model.WechatConfig, err error) {
models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "wechat"})
if err != nil {
return
}
err = gconv.Scan(models.List, &conf)
return
}
// GetPay 获取支付配置
func (s *sSysConfig) GetPay(ctx context.Context) (conf *model.PayConfig, err error) {
models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "pay"})
if err != nil {
return
}
err = gconv.Scan(models.List, &conf)
return
}
// GetSms 获取短信配置
func (s *sSysConfig) GetSms(ctx context.Context) (conf *model.SmsConfig, err error) {
models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "sms"})
if err != nil {
return nil, err
return
}
if err = gconv.Struct(models.List, &conf); err != nil {
return nil, err
}
return conf, nil
err = gconv.Scan(models.List, &conf)
return
}
// GetGeo 获取地理配置
func (s *sSysConfig) GetGeo(ctx context.Context) (conf *model.GeoConfig, err error) {
models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "geo"})
if err != nil {
return nil, err
return
}
if err = gconv.Struct(models.List, &conf); err != nil {
return nil, err
}
return conf, nil
err = gconv.Scan(models.List, &conf)
return
}
// GetUpload 获取上传配置
func (s *sSysConfig) GetUpload(ctx context.Context) (conf *model.UploadConfig, err error) {
models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "upload"})
if err != nil {
return nil, err
return
}
if err = gconv.Struct(models.List, &conf); err != nil {
return nil, err
}
return conf, nil
err = gconv.Scan(models.List, &conf)
return
}
// GetSmtp 获取邮件配置
func (s *sSysConfig) GetSmtp(ctx context.Context) (conf *model.EmailConfig, err error) {
models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "smtp"})
if err != nil {
return nil, err
return
}
if err = gconv.Struct(models.List, &conf); err != nil {
return nil, err
if err = gconv.Scan(models.List, &conf); err != nil {
return
}
conf.Addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
return conf, nil
return
}
// GetBasic 获取基础配置
func (s *sSysConfig) GetBasic(ctx context.Context) (conf *model.BasicConfig, err error) {
models, err := s.GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "basic"})
if err != nil {
return nil, err
return
}
if err = gconv.Struct(models.List, &conf); err != nil {
return nil, err
}
return conf, nil
err = gconv.Scan(models.List, &conf)
return
}
// GetLoadSSL 获取本地日志配置
func (s *sSysConfig) GetLoadSSL(ctx context.Context) (conf *model.SSLConfig, err error) {
if err = g.Cfg().MustGet(ctx, "hotgo.ssl").Struct(&conf); err != nil {
return nil, err
}
return conf, nil
err = g.Cfg().MustGet(ctx, "hotgo.ssl").Scan(&conf)
return
}
// GetLoadLog 获取本地日志配置
func (s *sSysConfig) GetLoadLog(ctx context.Context) (conf *model.LogConfig, err error) {
if err = g.Cfg().MustGet(ctx, "hotgo.log").Struct(&conf); err != nil {
return nil, err
}
return conf, nil
err = g.Cfg().MustGet(ctx, "hotgo.log").Scan(&conf)
return
}
// GetLoadServeLog 获取本地服务日志配置
func (s *sSysConfig) GetLoadServeLog(ctx context.Context) (conf *model.ServeLogConfig, err error) {
if err = g.Cfg().MustGet(ctx, "hotgo.serveLog").Struct(&conf); err != nil {
return nil, err
}
return conf, nil
err = g.Cfg().MustGet(ctx, "hotgo.serveLog").Scan(&conf)
return
}
// GetConfigByGroup 获取指定分组的配置
func (s *sSysConfig) GetConfigByGroup(ctx context.Context, in sysin.GetConfigInp) (*sysin.GetConfigModel, error) {
func (s *sSysConfig) GetConfigByGroup(ctx context.Context, in sysin.GetConfigInp) (res *sysin.GetConfigModel, err error) {
if in.Group == "" {
return nil, gerror.New("分组不能为空")
err = gerror.New("分组不能为空")
return
}
var (
mod = dao.SysConfig.Ctx(ctx)
models []*entity.SysConfig
res sysin.GetConfigModel
)
if err := mod.Fields("key", "value", "type").Where("group", in.Group).Scan(&models); err != nil {
return nil, err
}
isDemo := g.Cfg().MustGet(ctx, "hotgo.isDemo", false)
var (
models []*entity.SysConfig
isDemo = g.Cfg().MustGet(ctx, "hotgo.isDemo", false).Bool()
)
if err = dao.SysConfig.Ctx(ctx).Fields("key", "value", "type").Where("group", in.Group).Scan(&models); err != nil {
return
}
res = new(sysin.GetConfigModel)
if len(models) > 0 {
res.List = make(g.Map, len(models))
for _, v := range models {
@@ -180,42 +212,41 @@ func (s *sSysConfig) GetConfigByGroup(ctx context.Context, in sysin.GetConfigInp
return nil, err
}
res.List[v.Key] = val
//if isDemo.Bool() && (v.Key == "smtpUser" || v.Key == "smtpPass") {
// res.List[v.Key] = consts.DemoTips
// res.List[v.Key] = consts.DemoTips
//}
if isDemo.Bool() && gstr.InArray(MaskDemoField, v.Key) {
if isDemo && gstr.InArray(MaskDemoField, v.Key) {
res.List[v.Key] = consts.DemoTips
res.List[v.Key] = consts.DemoTips
}
}
}
return &res, nil
return
}
// ConversionType 转换类型
func (s *sSysConfig) ConversionType(ctx context.Context, models *entity.SysConfig) (value interface{}, err error) {
if models == nil {
return nil, gerror.New("数据不存在")
err = gerror.New("数据不存在")
return
}
return consts.ConvType(models.Value, models.Type), nil
}
// UpdateConfigByGroup 更新指定分组的配置
func (s *sSysConfig) UpdateConfigByGroup(ctx context.Context, in sysin.UpdateConfigInp) error {
func (s *sSysConfig) UpdateConfigByGroup(ctx context.Context, in sysin.UpdateConfigInp) (err error) {
if in.Group == "" {
return gerror.New("分组不能为空")
err = gerror.New("分组不能为空")
return
}
var (
mod = dao.SysConfig.Ctx(ctx)
models []*entity.SysConfig
)
if err := mod.Where("group", in.Group).Scan(&models); err != nil {
return err
if err = mod.Where("group", in.Group).Scan(&models); err != nil {
return
}
err := dao.SysConfig.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
err = dao.SysConfig.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
for k, v := range in.List {
row := s.getConfigByKey(k, models)
// 新增
@@ -233,24 +264,21 @@ func (s *sSysConfig) UpdateConfigByGroup(ctx context.Context, in sysin.UpdateCon
// return err
//}
//continue
return gerror.Newf("暂不支持从前台添加变量，请先在数据库表[%v]中配置变量：%v", dao.SysConfig.Table(), k)
err = gerror.Newf("暂不支持从前台添加变量，请先在数据库表[%v]中配置变量：%v", dao.SysConfig.Table(), k)
return
}
// 更新
_, err := dao.SysConfig.Ctx(ctx).Where("id", row.Id).Data(g.Map{"value": v, "updated_at": gtime.Now()}).Update()
_, err = dao.SysConfig.Ctx(ctx).Where("id", row.Id).Data(g.Map{"value": v, "updated_at": gtime.Now()}).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
}
return nil
return s.syncUpdate(ctx, in)
})
if err != nil {
return err
}
return nil
return
}
func (s *sSysConfig) getConfigByKey(key string, models []*entity.SysConfig) *entity.SysConfig {
@@ -266,3 +294,24 @@ func (s *sSysConfig) getConfigByKey(key string, models []*entity.SysConfig) *ent
return nil
}
// syncUpdate 同步更新一些加载配置
func (s *sSysConfig) syncUpdate(ctx context.Context, in sysin.UpdateConfigInp) (err error) {
switch in.Group {
case "wechat":
wx, err := s.GetWechat(ctx)
if err == nil {
wechat.SetConfig(wx)
}
case "pay":
pay, err := s.GetPay(ctx)
if err == nil {
payment.SetConfig(pay)
}
}
if err != nil {
err = gerror.Newf("syncUpdate %v conifg fail：%+v", in.Group, err.Error())
}
return
}

78
server/internal/logic/sys/cron.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
@@ -64,15 +63,12 @@ func (s *sSysCron) Delete(ctx context.Context, in sysin.CronDeleteInp) (err erro
}
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
_, err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
if _, err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Delete(); err != nil {
return
}
return crons.Delete(models)
})
return nil
return
}
// Edit 修改/新增
@@ -84,17 +80,12 @@ func (s *sSysCron) Edit(ctx context.Context, in sysin.CronEditInp) (err error) {
// 修改
if in.Id > 0 {
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
_, err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
simple.SafeGo(ctx, func(ctx context.Context) {
crons.RefreshStatus(&in.SysCron)
})
if _, err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Data(in).Update(); err != nil {
return
}
simple.SafeGo(ctx, func(ctx context.Context) {
crons.RefreshStatus(&in.SysCron)
})
return
}
@@ -104,26 +95,25 @@ func (s *sSysCron) Edit(ctx context.Context, in sysin.CronEditInp) (err error) {
return
}
// Status 更新部门状态
// Status 更新状态
func (s *sSysCron) Status(ctx context.Context, in sysin.CronStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
var models *entity.SysCron
if err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
@@ -132,18 +122,13 @@ func (s *sSysCron) Status(ctx context.Context, in sysin.CronStatusInp) (err erro
return
}
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
_, err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
_, err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
}
models.Status = in.Status
simple.SafeGo(ctx, func(ctx context.Context) {
crons.RefreshStatus(models)
})
return
models.Status = in.Status
simple.SafeGo(ctx, func(ctx context.Context) {
crons.RefreshStatus(models)
})
return
}
@@ -151,25 +136,24 @@ func (s *sSysCron) Status(ctx context.Context, in sysin.CronStatusInp) (err erro
// MaxSort 最大排序
func (s *sSysCron) MaxSort(ctx context.Context, in sysin.CronMaxSortInp) (res *sysin.CronMaxSortModel, err error) {
if err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
if res == nil {
res = new(sysin.CronMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return res, nil
return
}
// View 获取指定字典类型信息
// View 获取指定信息
func (s *sSysCron) View(ctx context.Context, in sysin.CronViewInp) (res *sysin.CronViewModel, err error) {
if err = dao.SysCron.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
return res, nil
return
}
// List 获取列表
@@ -187,34 +171,34 @@ func (s *sSysCron) List(ctx context.Context, in sysin.CronListInp) (list []*sysi
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
for _, v := range list {
v.GroupName, _ = dao.SysCronGroup.GetName(ctx, v.GroupId)
}
return list, totalCount, err
return
}
// OnlineExec 在线执行
func (s *sSysCron) OnlineExec(ctx context.Context, in sysin.OnlineExecInp) (err error) {
var data *entity.SysCron
err = dao.SysCron.Ctx(ctx).Where(dao.SysCron.Columns().Id, in.Id).Scan(&data)
if err != nil {
if err = dao.SysCron.Ctx(ctx).Where(dao.SysCron.Columns().Id, in.Id).Scan(&data); err != nil {
return
}
if data == nil {
return gerror.New("定时任务不存在")
err = gerror.New("定时任务不存在")
return
}
newCtx := context.WithValue(gctx.New(), consts.ContextKeyCronArgs, strings.Split(data.Params, consts.CronSplitStr))

93
server/internal/logic/sys/cron_group.go
View File

@@ -3,16 +3,15 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/os/gtime"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/sysin"
"hotgo/internal/service"
"hotgo/utility/validate"
@@ -29,129 +28,95 @@ func init() {
}
// Delete 删除
func (s *sSysCronGroup) Delete(ctx context.Context, in sysin.CronGroupDeleteInp) error {
_, err := dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
func (s *sSysCronGroup) Delete(ctx context.Context, in sysin.CronGroupDeleteInp) (err error) {
_, err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sSysCronGroup) Edit(ctx context.Context, in sysin.CronGroupEditInp) (err error) {
if in.Name == "" {
err = gerror.New("分组名称不能为空")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
if in.Id > 0 {
_, err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// 新增
in.CreatedAt = gtime.Now()
_, err = dao.SysCronGroup.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Status 更新部门状态
// Status 更新状态
func (s *sSysCronGroup) Status(ctx context.Context, in sysin.CronGroupStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
_, err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// MaxSort 最大排序
func (s *sSysCronGroup) MaxSort(ctx context.Context, in sysin.CronGroupMaxSortInp) (*sysin.CronGroupMaxSortModel, error) {
var res sysin.CronGroupMaxSortModel
func (s *sSysCronGroup) MaxSort(ctx context.Context, in sysin.CronGroupMaxSortInp) (res *sysin.CronGroupMaxSortModel, err error) {
if in.Id > 0 {
if err := dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
if err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
return
}
}
res.Sort = res.Sort + 10
return &res, nil
}
// View 获取指定字典类型信息
func (s *sSysCronGroup) View(ctx context.Context, in sysin.CronGroupViewInp) (res *sysin.CronGroupViewModel, err error) {
if err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
if res == nil {
res = new(sysin.CronGroupMaxSortModel)
}
return res, nil
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// View 获取指定信息
func (s *sSysCronGroup) View(ctx context.Context, in sysin.CronGroupViewInp) (res *sysin.CronGroupViewModel, err error) {
err = dao.SysCronGroup.Ctx(ctx).Where("id", in.Id).Scan(&res)
return
}
// List 获取列表
func (s *sSysCronGroup) List(ctx context.Context, in sysin.CronGroupListInp) (list []*sysin.CronGroupListModel, totalCount int, err error) {
mod := dao.SysCronGroup.Ctx(ctx)
// 访问路径
if in.Name != "" {
mod = mod.WhereLike("name", "%"+in.Name+"%")
}
// 请求方式
if in.Status > 0 {
mod = mod.Where("status", in.Status)
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
return list, totalCount, err
err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list)
return
}
// Select 选项

14
server/internal/logic/sys/curd_demo.go
View File

@@ -3,9 +3,8 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
// @AutoGenerate Version 2.1.4
// @AutoGenerate Date 2023-02-20 16:41:58
//
// @AutoGenerate Version 2.5.3
// @AutoGenerate Date 2023-04-28 15:28:40
package sys
import (
@@ -75,12 +74,8 @@ func (s *sSysCurdDemo) List(ctx context.Context, in sysin.CurdDemoListInp) (list
dao.TestCategory.Table(), "testCategory", dao.TestCategory.Columns().Id, // 关联表表名,别名,关联条件
)...)
totalCount, err = mod.Clone().Count(1)
if err != nil {
return
}
if totalCount == 0 {
totalCount, err = mod.Clone().Count()
if totalCount == 0 || err != nil {
return
}
@@ -88,7 +83,6 @@ func (s *sSysCurdDemo) List(ctx context.Context, in sysin.CurdDemoListInp) (list
fields, err := hgorm.GenJoinSelect(ctx, sysin.CurdDemoListModel{}, dao.SysGenCurdDemo, []*hgorm.Join{
{Dao: dao.TestCategory, Alias: "testCategory"},
})
err = mod.Fields(fields).Page(in.Page, in.PerPage).OrderAsc(dao.SysGenCurdDemo.Columns().Sort).OrderDesc(dao.SysGenCurdDemo.Columns().Id).Scan(&list)
return
}

55
server/internal/logic/sys/dict_type.go
View File

@@ -3,13 +3,11 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/os/gtime"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/model/entity"
@@ -36,7 +34,7 @@ func (s *sSysDictType) Tree(ctx context.Context) (list []*sysin.DictTypeTree, er
if err = mod.Order("sort asc,id asc").Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, err
return
}
list = s.treeList(0, models)
@@ -44,17 +42,15 @@ func (s *sSysDictType) Tree(ctx context.Context) (list []*sysin.DictTypeTree, er
}
// Delete 删除
func (s *sSysDictType) Delete(ctx context.Context, in sysin.DictTypeDeleteInp) error {
var (
models *entity.SysDictType
)
err := dao.SysDictType.Ctx(ctx).Where("id", in.Id).Scan(&models)
if err != nil {
return err
func (s *sSysDictType) Delete(ctx context.Context, in sysin.DictTypeDeleteInp) (err error) {
var models *entity.SysDictType
if err = dao.SysDictType.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
return
}
if models == nil {
return gerror.New("数据不存在或已删除！")
err = gerror.New("数据不存在或已删除！")
return
}
exist, err := dao.SysDictData.Ctx(ctx).Where("type", models.Type).One()
@@ -63,7 +59,8 @@ func (s *sSysDictType) Delete(ctx context.Context, in sysin.DictTypeDeleteInp) e
return err
}
if !exist.IsEmpty() {
return gerror.New("请先删除该字典类型下得所有字典数据！")
err = gerror.New("请先删除该字典类型下得所有字典数据！")
return
}
pidExist, err := dao.SysDictType.Ctx(ctx).Where("pid", models.Id).One()
@@ -71,56 +68,42 @@ func (s *sSysDictType) Delete(ctx context.Context, in sysin.DictTypeDeleteInp) e
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
if !pidExist.IsEmpty() {
return gerror.New("请先删除该字典类型下得所有子级类型！")
err = gerror.New("请先删除该字典类型下得所有子级类型！")
return
}
_, err = dao.SysDictType.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Edit 修改/新增
func (s *sSysDictType) Edit(ctx context.Context, in sysin.DictTypeEditInp) (err error) {
if in.Name == "" {
err = gerror.New("名称不能为空")
return err
return
}
uniqueName, err := dao.SysDictType.IsUniqueType(ctx, in.Id, in.Name)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
if !uniqueName {
err = gerror.New("名称已存在")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
if in.Id > 0 {
_, err = dao.SysDictType.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// 新增
in.CreatedAt = gtime.Now()
_, err = dao.SysDictType.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// TreeSelect 获取类型关系树选项
@@ -132,7 +115,7 @@ func (s *sSysDictType) TreeSelect(ctx context.Context, in sysin.DictTreeSelectIn
if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, err
return
}
list = s.treeList(0, models)

143
server/internal/logic/sys/ems_log.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
@@ -42,77 +41,55 @@ func init() {
}
// Delete 删除
func (s *sSysEmsLog) Delete(ctx context.Context, in sysin.EmsLogDeleteInp) error {
_, err := dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
func (s *sSysEmsLog) Delete(ctx context.Context, in sysin.EmsLogDeleteInp) (err error) {
_, err = dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sSysEmsLog) Edit(ctx context.Context, in sysin.EmsLogEditInp) (err error) {
if in.Ip == "" {
err = gerror.New("ip不能为空")
return err
return
}
// 修改
if in.Id > 0 {
_, err = dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// 新增
_, err = dao.SysEmsLog.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Status 更新部门状态
func (s *sSysEmsLog) Status(ctx context.Context, in sysin.EmsLogStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
_, err = dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// View 获取指定字典类型信息
func (s *sSysEmsLog) View(ctx context.Context, in sysin.EmsLogViewInp) (res *sysin.EmsLogViewModel, err error) {
if err = dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.SysEmsLog.Ctx(ctx).Where("id", in.Id).Scan(&res)
return
}
// List 获取列表
@@ -126,19 +103,15 @@ func (s *sSysEmsLog) List(ctx context.Context, in sysin.EmsLogListInp) (list []*
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
return list, totalCount, err
err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list)
return
}
// Send 发送邮件
@@ -146,22 +119,21 @@ 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 {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
config, err := service.SysConfig().GetSmtp(ctx)
if err != nil {
return err
return
}
in.Template, err = s.GetTemplate(ctx, in.Event, config)
if err != nil {
return err
return
}
err = s.AllowSend(ctx, models, config)
if err != nil {
return err
if err = s.AllowSend(ctx, models, config); err != nil {
return
}
if consts.IsCodeEmsTemplate(in.Event) && in.Code == "" {
@@ -170,7 +142,7 @@ func (s *sSysEmsLog) Send(ctx context.Context, in sysin.SendEmsInp) (err error)
view, err := s.newView(ctx, in, config)
if err != nil {
return err
return
}
if in.TplData == nil {
@@ -204,7 +176,7 @@ func (s *sSysEmsLog) Send(ctx context.Context, in sysin.SendEmsInp) (err error)
err = ems.Send(config, in.Email, subject, in.Content)
if err != nil {
return err
return
}
var data = new(entity.SysEmsLog)
@@ -218,11 +190,7 @@ func (s *sSysEmsLog) Send(ctx context.Context, in sysin.SendEmsInp) (err error)
data.UpdatedAt = gtime.Now()
_, err = dao.SysEmsLog.Ctx(ctx).Data(data).Insert()
if err != nil {
return err
}
return nil
return
}
func (s *sSysEmsLog) newView(ctx context.Context, in sysin.SendEmsInp, config *model.EmailConfig) (view *gview.View, err error) {
@@ -238,6 +206,7 @@ func (s *sSysEmsLog) newView(ctx context.Context, in sysin.SendEmsInp, config *m
if in.Event == consts.EmsTemplateText {
return
}
var (
username string
user = contexts.GetUser(ctx)
@@ -319,17 +288,19 @@ func (s *sSysEmsLog) newView(ctx context.Context, in sysin.SendEmsInp, config *m
// GetTemplate 获取指定邮件模板
func (s *sSysEmsLog) GetTemplate(ctx context.Context, template string, config *model.EmailConfig) (val string, err error) {
if template == "" {
return "", gerror.New("模板不能为空")
err = gerror.New("模板不能为空")
return
}
if config == nil {
config, err = service.SysConfig().GetSmtp(ctx)
if err != nil {
return "", err
return
}
}
if len(config.Template) == 0 {
return "", gerror.New("管理员还没有配置任何模板！")
err = gerror.New("管理员还没有配置任何模板！")
return
}
for _, v := range config.Template {
@@ -344,23 +315,24 @@ func (s *sSysEmsLog) GetTemplate(ctx context.Context, template string, config *m
// AllowSend 是否允许发送
func (s *sSysEmsLog) AllowSend(ctx context.Context, models *entity.SysEmsLog, config *model.EmailConfig) (err error) {
if models == nil {
return nil
return
}
// 富文本事件不限制
if models.Event == consts.EmsTemplateText {
return nil
return
}
if config == nil {
config, err = service.SysConfig().GetSmtp(ctx)
if err != nil {
return err
return
}
}
if gtime.Now().Before(models.CreatedAt.Add(time.Second * time.Duration(config.MinInterval))) {
return gerror.New("发送频繁，请稍后再试！")
err = gerror.New("发送频繁，请稍后再试！")
return
}
if config.MaxIpLimit > 0 {
@@ -370,7 +342,8 @@ func (s *sSysEmsLog) AllowSend(ctx context.Context, models *entity.SysEmsLog, co
}
if count >= config.MaxIpLimit {
return gerror.New("今天发送短信过多，请次日后再试！")
err = gerror.New("今天发送短信过多，请次日后再试！")
return err
}
}
@@ -380,53 +353,56 @@ func (s *sSysEmsLog) AllowSend(ctx context.Context, models *entity.SysEmsLog, co
// VerifyCode 效验验证码
func (s *sSysEmsLog) VerifyCode(ctx context.Context, in sysin.VerifyEmsCodeInp) (err error) {
if in.Event == "" {
return gerror.New("事件不能为空")
err = gerror.New("事件不能为空")
return
}
if in.Email == "" {
return gerror.New("邮箱不能为空")
err = gerror.New("邮箱不能为空")
return
}
if in.Event == consts.EmsTemplateResetPwd || in.Event == consts.EmsTemplateText {
return gerror.Newf("事件类型无需验证:%v", in.Event)
err = gerror.Newf("事件类型无需验证:%v", in.Event)
return
}
config, err := service.SysConfig().GetSmtp(ctx)
if err != nil {
return err
return
}
var (
models *entity.SysEmsLog
)
var models *entity.SysEmsLog
if err = dao.SysEmsLog.Ctx(ctx).Where("event", in.Event).Where("email", in.Email).Order("id desc").Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
if models == nil {
return gerror.New("验证码错误")
err = gerror.New("验证码错误")
return
}
if models.Times >= 10 {
return gerror.New("验证码错误次数过多，请重新发送！")
err = gerror.New("验证码错误次数过多，请重新发送！")
return
}
if in.Event != consts.EmsTemplateCode {
if models.Status == consts.EmsStatusUsed {
return gerror.New("验证码已使用，请重新发送！")
err = gerror.New("验证码已使用，请重新发送！")
return
}
}
if gtime.Now().After(models.CreatedAt.Add(time.Second * time.Duration(config.CodeExpire))) {
return gerror.New("验证码已过期，请重新发送")
err = gerror.New("验证码已过期，请重新发送")
return
}
if models.Code != in.Code {
_, err = dao.SysEmsLog.Ctx(ctx).Where("id", models.Id).Increment("times", 1)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return gerror.New("验证码错误！")
dao.SysEmsLog.Ctx(ctx).Where("id", models.Id).Increment("times", 1)
err = gerror.New("验证码错误！")
return
}
_, err = dao.SysEmsLog.Ctx(ctx).Where("id", models.Id).Data(g.Map{
@@ -434,10 +410,5 @@ func (s *sSysEmsLog) VerifyCode(ctx context.Context, in sysin.VerifyEmsCodeInp)
"status": consts.EmsStatusUsed,
"updated_at": gtime.Now(),
}).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return
}

99
server/internal/logic/sys/gen_codes.go
View File

@@ -18,6 +18,7 @@ import (
"hotgo/internal/dao"
"hotgo/internal/library/hggen"
"hotgo/internal/model"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/sysin"
"hotgo/internal/service"
"hotgo/utility/validate"
@@ -34,25 +35,20 @@ func init() {
}
// Delete 删除
func (s *sSysGenCodes) Delete(ctx context.Context, in sysin.GenCodesDeleteInp) error {
_, err := dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
func (s *sSysGenCodes) Delete(ctx context.Context, in sysin.GenCodesDeleteInp) (err error) {
_, err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sSysGenCodes) Edit(ctx context.Context, in sysin.GenCodesEditInp) (res *sysin.GenCodesEditModel, err error) {
if in.GenType == 0 {
err = gerror.New("生成类型不能为空")
return nil, err
return
}
if in.VarName == "" {
err = gerror.New("实体名称不能为空")
return nil, err
return
}
if in.GenType == consts.GenCodesTypeCurd {
@@ -69,7 +65,7 @@ func (s *sSysGenCodes) Edit(ctx context.Context, in sysin.GenCodesEditInp) (res
if temp.IsAddon && in.AddonName == "" {
err = gerror.New("插件模板必须选择一个有效的插件")
return nil, err
return
}
}
@@ -79,7 +75,7 @@ func (s *sSysGenCodes) Edit(ctx context.Context, in sysin.GenCodesEditInp) (res
_, err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
return &sysin.GenCodesEditModel{SysGenCodes: in.SysGenCodes}, nil
}
@@ -95,7 +91,7 @@ func (s *sSysGenCodes) Edit(ctx context.Context, in sysin.GenCodesEditInp) (res
id, err := dao.SysGenCodes.Ctx(ctx).Data(in).InsertAndGetId()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
in.Id = id
@@ -106,49 +102,44 @@ func (s *sSysGenCodes) Edit(ctx context.Context, in sysin.GenCodesEditInp) (res
func (s *sSysGenCodes) Status(ctx context.Context, in sysin.GenCodesStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
_, err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// MaxSort 最大排序
func (s *sSysGenCodes) MaxSort(ctx context.Context, in sysin.GenCodesMaxSortInp) (*sysin.GenCodesMaxSortModel, error) {
var res sysin.GenCodesMaxSortModel
func (s *sSysGenCodes) MaxSort(ctx context.Context, in sysin.GenCodesMaxSortInp) (res *sysin.GenCodesMaxSortModel, err error) {
if in.Id > 0 {
if err := dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
if err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
}
res.Sort = res.Sort + 10
return &res, nil
if res == nil {
res = new(sysin.GenCodesMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// View 获取指定字典类型信息
func (s *sSysGenCodes) View(ctx context.Context, in sysin.GenCodesViewInp) (res *sysin.GenCodesViewModel, err error) {
if err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.SysGenCodes.Ctx(ctx).Where("id", in.Id).Scan(&res)
return
}
// List 获取列表
@@ -168,18 +159,13 @@ func (s *sSysGenCodes) List(ctx context.Context, in sysin.GenCodesListInp) (list
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
if totalCount == 0 {
return list, totalCount, nil
if err != nil || totalCount == 0 {
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
typeSelect, err := hggen.GenTypeSelect(ctx)
@@ -187,7 +173,7 @@ func (s *sSysGenCodes) List(ctx context.Context, in sysin.GenCodesListInp) (list
return
}
getTemplateGroup := func(row *sysin.GenCodesListModel) string {
getTpGroup := func(row *sysin.GenCodesListModel) string {
if row == nil {
return ""
}
@@ -206,11 +192,11 @@ func (s *sSysGenCodes) List(ctx context.Context, in sysin.GenCodesListInp) (list
if len(list) > 0 {
for _, v := range list {
v.GenTemplateGroup = getTemplateGroup(v)
v.GenTemplateGroup = getTpGroup(v)
}
}
return list, totalCount, err
return
}
// Selects 选项
@@ -227,9 +213,8 @@ func (s *sSysGenCodes) TableSelect(ctx context.Context, in sysin.GenCodesTableSe
lists []*sysin.GenCodesTableSelectModel
)
err = g.DB(in.Name).Ctx(ctx).Raw(fmt.Sprintf(sql, config.Name)).Scan(&lists)
if err != nil {
return nil, err
if err = g.DB(in.Name).Ctx(ctx).Raw(fmt.Sprintf(sql, config.Name)).Scan(&lists); err != nil {
return
}
patternStr := `addon_(\w+)_`
@@ -267,7 +252,8 @@ func (s *sSysGenCodes) TableSelect(ctx context.Context, in sysin.GenCodesTableSe
res = append(res, row)
}
return res, nil
return
}
// ColumnSelect 表字段选项
@@ -277,20 +263,21 @@ func (s *sSysGenCodes) ColumnSelect(ctx context.Context, in sysin.GenCodesColumn
config = g.DB(in.Name).GetConfig()
)
err = g.DB(in.Name).Ctx(ctx).Raw(fmt.Sprintf(sql, config.Name, in.Table)).Scan(&res)
if err != nil {
return nil, err
if err = g.DB(in.Name).Ctx(ctx).Raw(fmt.Sprintf(sql, config.Name, in.Table)).Scan(&res); err != nil {
return
}
if len(res) == 0 {
return nil, gerror.Newf("table does not exist:%v", in.Table)
err = gerror.Newf("table does not exist:%v", in.Table)
return
}
for k, v := range res {
res[k].Name = fmt.Sprintf("%s (%s)", v.Value, v.Label)
res[k].Label = res[k].Name
}
return res, nil
return
}
// ColumnList 表字段列表
@@ -306,14 +293,12 @@ func (s *sSysGenCodes) Preview(ctx context.Context, in sysin.GenCodesPreviewInp)
// Build 提交生成
func (s *sSysGenCodes) Build(ctx context.Context, in sysin.GenCodesBuildInp) (err error) {
// 先保存配置
_, err = s.Edit(ctx, sysin.GenCodesEditInp{SysGenCodes: in.SysGenCodes})
if err != nil {
if _, err = s.Edit(ctx, sysin.GenCodesEditInp{SysGenCodes: in.SysGenCodes}); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
err = s.Status(ctx, sysin.GenCodesStatusInp{Id: in.Id, Status: consts.GenCodesStatusOk})
if err != nil {
if err = s.Status(ctx, sysin.GenCodesStatusInp{Id: in.Id, Status: consts.GenCodesStatusOk}); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}

86
server/internal/logic/sys/log.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
@@ -90,16 +89,13 @@ func (s *sSysLog) Export(ctx context.Context, in sysin.LogListInp) (err error) {
exportList = append(exportList, row)
}
if err = excel.ExportByStructs(ctx, titleList, exportList, fileName, sheetName); err != nil {
return err
}
err = excel.ExportByStructs(ctx, titleList, exportList, fileName, sheetName)
return
}
// RealWrite 真实写入
func (s *sSysLog) RealWrite(ctx context.Context, commonLog entity.SysLog) (err error) {
_, err = dao.SysLog.Ctx(ctx).Data(commonLog).FieldsEx(dao.SysLog.Columns().Id).Insert()
func (s *sSysLog) RealWrite(ctx context.Context, log entity.SysLog) (err error) {
_, err = dao.SysLog.Ctx(ctx).FieldsEx(dao.SysLog.Columns().Id).Data(log).Insert()
return
}
@@ -114,11 +110,7 @@ func (s *sSysLog) AutoLog(ctx context.Context) error {
}()
config, err := service.SysConfig().GetLoadLog(ctx)
if err != nil {
return
}
if !config.Switch {
if err != nil || !config.Switch {
return
}
@@ -144,23 +136,24 @@ func (s *sSysLog) AutoLog(ctx context.Context) error {
// AnalysisLog 解析日志数据
func (s *sSysLog) AnalysisLog(ctx context.Context) entity.SysLog {
var (
modelContext = contexts.Get(ctx)
response = modelContext.Response
user = modelContext.User
request = ghttp.RequestFromCtx(ctx)
module = modelContext.Module
clientIp = location.GetClientIp(request)
postData = gjson.New(request.GetBodyString())
getData = gjson.New(request.URL.Query())
headerData = gjson.New(consts.NilJsonToString)
errorData = gjson.New(consts.NilJsonToString)
data entity.SysLog
memberId int64
errorCode int
errorMsg string
traceID string
timestamp int64
appId string
mctx = contexts.Get(ctx)
response = mctx.Response
user = mctx.User
request = ghttp.RequestFromCtx(ctx)
module = mctx.Module
clientIp = location.GetClientIp(request)
postData = gjson.New(consts.NilJsonToString)
getData = gjson.New(request.URL.Query())
headerData = gjson.New(consts.NilJsonToString)
errorData = gjson.New(consts.NilJsonToString)
data entity.SysLog
memberId int64
errorCode int
errorMsg string
traceID string
timestamp int64
appId string
takeUpTime int64
)
// 响应数据
@@ -180,12 +173,18 @@ func (s *sSysLog) AnalysisLog(ctx context.Context) entity.SysLog {
}
// post参数
if body, ok := mctx.Data["request.body"].(*gjson.Json); ok {
postData = body
}
// post表单
postForm := gjson.New(gconv.String(request.PostForm)).Map()
if len(postForm) > 0 {
for k, v := range postForm {
postData.MustAppend(k, v)
}
}
if postData.IsNil() || len(postData.Map()) == 0 {
postData = gjson.New(consts.NilJsonToString)
}
@@ -200,10 +199,16 @@ func (s *sSysLog) AnalysisLog(ctx context.Context) entity.SysLog {
if err != nil {
g.Log().Infof(ctx, "location.GetLocation clientIp:%v, err:%+v", clientIp, err)
}
if ipData == nil {
ipData = new(location.IpLocationData)
}
// 请求耗时
if tt, ok := mctx.Data["request.takeUpTime"].(int64); ok {
takeUpTime = tt
}
data = entity.SysLog{
AppId: appId,
MerchantId: 0,
@@ -224,8 +229,9 @@ func (s *sSysLog) AnalysisLog(ctx context.Context) entity.SysLog {
Timestamp: timestamp,
UserAgent: request.Header.Get("User-Agent"),
Status: consts.StatusEnabled,
TakeUpTime: modelContext.TakeUpTime,
TakeUpTime: takeUpTime,
}
return data
}
@@ -305,20 +311,15 @@ func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
if totalCount == 0 {
return list, totalCount, err
if err != nil || totalCount == 0 {
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
isDemo := g.Cfg().MustGet(ctx, "hotgo.isDemo", false)
isDemo := g.Cfg().MustGet(ctx, "hotgo.isDemo", false).Bool()
for i := 0; i < len(list); i++ {
// 管理员
if list[i].AppId == consts.AppAdmin {
@@ -329,6 +330,7 @@ func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.
}
list[i].MemberName = memberName.String()
}
// 接口
if list[i].AppId == consts.AppApi {
//memberName, err = dao.Member.Ctx(ctx).Fields("realname").Where("id", res.List[i].MemberId).Value()
@@ -354,7 +356,7 @@ func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.
list[i].Url = gstr.StrTillEx(list[i].Url, "?")
}
if isDemo.Bool() {
if isDemo {
list[i].HeaderData = gjson.New(`{
"none": [
"` + consts.DemoTips + `"
@@ -364,5 +366,5 @@ func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.
}
return list, totalCount, err
return
}

44
server/internal/logic/sys/login_log.go
View File

@@ -3,7 +3,6 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
@@ -79,13 +78,8 @@ func (s *sSysLoginLog) List(ctx context.Context, in sysin.LoginLogListInp) (list
)...)
totalCount, err = mod.Clone().Count(1)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
if totalCount == 0 {
return list, totalCount, nil
if err != nil || totalCount == 0 {
return
}
//关联表select
@@ -99,7 +93,6 @@ func (s *sSysLoginLog) List(ctx context.Context, in sysin.LoginLogListInp) (list
}
for _, v := range list {
//g.DumpWithType(v)
//// 获取省市编码对应的地区名称
//region, err := location.ParseRegion(ctx, v.SysLogProvinceId, v.SysLogCityId, 0)
//if err != nil {
@@ -110,20 +103,20 @@ func (s *sSysLoginLog) List(ctx context.Context, in sysin.LoginLogListInp) (list
v.Browser = useragent.GetBrowser(v.SysLogUserAgent)
}
return list, totalCount, err
return
}
// Export 导出登录日志
func (s *sSysLoginLog) Export(ctx context.Context, in sysin.LoginLogListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return err
return
}
// 字段的排序是依据tags的字段顺序，如果你不想使用默认的排序方式，可以直接定义 tags = []string{"字段名称", "字段名称2", ...}
tags, err := convert.GetEntityDescTags(sysin.LoginLogExportModel{})
if err != nil {
return err
return
}
var (
@@ -132,35 +125,24 @@ func (s *sSysLoginLog) Export(ctx context.Context, in sysin.LoginLogListInp) (er
exports []sysin.LoginLogExportModel
)
err = gconv.Scan(list, &exports)
if err != nil {
return err
}
if err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName); err != nil {
if err = gconv.Scan(list, &exports); err != nil {
return
}
err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
return
}
// Delete 删除登录日志
func (s *sSysLoginLog) Delete(ctx context.Context, in sysin.LoginLogDeleteInp) (err error) {
_, err = dao.SysLoginLog.Ctx(ctx).Where(dao.SysLoginLog.Columns().Id, in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// View 获取登录日志指定信息
func (s *sSysLoginLog) View(ctx context.Context, in sysin.LoginLogViewInp) (res *sysin.LoginLogViewModel, err error) {
if err = dao.SysLoginLog.Ctx(ctx).Where(dao.SysLoginLog.Columns().Id, in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.SysLoginLog.Ctx(ctx).Where(dao.SysLoginLog.Columns().Id, in.Id).Scan(&res)
return
}
// Push 推送登录日志
@@ -184,13 +166,13 @@ func (s *sSysLoginLog) Push(ctx context.Context, in sysin.LoginLogPushInp) {
}
if err := queue.Push(consts.QueueLoginLogTopic, models); err != nil {
g.Log().Warningf(ctx, "sSysLoginLog.Push err:%+v", err)
g.Log().Warningf(ctx, "sSysLoginLog.Push err:%+v, models:%+v", err, models)
}
return
}
// RealWrite 真实写入
func (s *sSysLoginLog) RealWrite(ctx context.Context, models entity.SysLoginLog) (err error) {
_, err = dao.SysLoginLog.Ctx(ctx).Data(models).FieldsEx(dao.SysLoginLog.Columns().Id).Insert()
_, err = dao.SysLoginLog.Ctx(ctx).FieldsEx(dao.SysLog.Columns().Id).Data(models).Insert()
return
}

115
server/internal/logic/sys/provinces.go
View File

@@ -10,7 +10,6 @@ import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/consts"
"hotgo/internal/dao"
@@ -38,7 +37,7 @@ func (s *sSysProvinces) Tree(ctx context.Context) (list []g.Map, err error) {
var models []*entity.SysProvinces
if err = dao.SysProvinces.Ctx(ctx).Order("pid asc,id asc,sort asc").Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, err
return
}
list = gconv.SliceMap(models)
@@ -51,36 +50,30 @@ func (s *sSysProvinces) Tree(ctx context.Context) (list []g.Map, err error) {
}
// Delete 删除
func (s *sSysProvinces) Delete(ctx context.Context, in sysin.ProvincesDeleteInp) error {
var (
models *entity.SysProvinces
)
err := dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Scan(&models)
if err != nil {
return err
func (s *sSysProvinces) Delete(ctx context.Context, in sysin.ProvincesDeleteInp) (err error) {
var models *entity.SysProvinces
if err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
return
}
if models == nil {
return gerror.New("数据不存在或已删除！")
err = gerror.New("数据不存在或已删除！")
return
}
pidExist, err := dao.SysProvinces.Ctx(ctx).Where("pid", models.Id).One()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
if !pidExist.IsEmpty() {
return gerror.New("请先删除该地区下得所有子级！")
err = gerror.New("请先删除该地区下得所有子级！")
return
}
_, err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Edit 修改/新增
@@ -98,7 +91,7 @@ func (s *sSysProvinces) Edit(ctx context.Context, in sysin.ProvincesEditInp) (er
// 关系树
in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.SysProvinces, in.Pid)
if err != nil {
return err
return
}
isUpdate := false
@@ -114,70 +107,52 @@ func (s *sSysProvinces) Edit(ctx context.Context, in sysin.ProvincesEditInp) (er
// 修改
if isUpdate {
_, err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// 新增
_, err = dao.SysProvinces.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Status 更新部门状态
func (s *sSysProvinces) Status(ctx context.Context, in sysin.ProvincesStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
_, err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// MaxSort 最大排序
func (s *sSysProvinces) MaxSort(ctx context.Context, in sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error) {
if err = dao.SysProvinces.Ctx(ctx).Fields(dao.SysProvinces.Columns().Sort).OrderDesc(dao.SysProvinces.Columns().Sort).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
if res == nil {
res = new(sysin.ProvincesMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return res, nil
return
}
// View 获取指定字典类型信息
func (s *sSysProvinces) View(ctx context.Context, in sysin.ProvincesViewInp) (res *sysin.ProvincesViewModel, err error) {
if err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Scan(&res)
return
}
// List 获取列表
@@ -193,21 +168,12 @@ func (s *sSysProvinces) List(ctx context.Context, in sysin.ProvincesListInp) (li
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
if err != nil || totalCount == 0 {
return
}
if totalCount == 0 {
return list, totalCount, nil
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
return list, totalCount, err
err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list)
return
}
// ChildrenList 获取省市区下级列表
@@ -227,21 +193,12 @@ func (s *sSysProvinces) ChildrenList(ctx context.Context, in sysin.ProvincesChil
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
if err != nil || totalCount == 0 {
return
}
if totalCount == 0 {
return list, totalCount, nil
}
if err = mod.Page(in.Page, in.PerPage).Order("sort asc,id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
return list, totalCount, err
err = mod.Page(in.Page, in.PerPage).Order("sort asc,id desc").Scan(&list)
return
}
// UniqueId 获取省市区下级列表
@@ -254,10 +211,10 @@ func (s *sSysProvinces) UniqueId(ctx context.Context, in sysin.ProvincesUniqueId
if err = hgorm.IsUnique(ctx, dao.SysProvinces, g.Map{dao.SysProvinces.Columns().Id: in.NewId}, "", in.OldId); err != nil {
res.IsUnique = false
return res, nil
return
}
return res, nil
return
}
// Select 省市区选项

48
server/internal/logic/sys/serve_log.go
View File

@@ -3,17 +3,14 @@
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
package sys
import (
"context"
"fmt"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/hgorm"
"hotgo/internal/library/hgorm/handler"
@@ -71,38 +68,30 @@ func (s *sSysServeLog) List(ctx context.Context, in sysin.ServeLogListInp) (list
)...)
totalCount, err = mod.Clone().Count(1)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
if totalCount == 0 {
return list, totalCount, nil
if err != nil || totalCount == 0 {
return
}
//关联表select
fields, err := hgorm.GenJoinSelect(ctx, sysin.ServeLogListModel{}, dao.SysServeLog, []*hgorm.Join{
{Dao: dao.SysLog, Alias: "sysLog"},
})
if err = mod.Fields(fields).Handler(handler.FilterAuth).Page(in.Page, in.PerPage).OrderDesc(dao.SysServeLog.Columns().Id).Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
return list, totalCount, err
err = mod.Fields(fields).Handler(handler.FilterAuth).Page(in.Page, in.PerPage).OrderDesc(dao.SysServeLog.Columns().Id).Scan(&list)
return
}
// Export 导出服务日志
func (s *sSysServeLog) Export(ctx context.Context, in sysin.ServeLogListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return err
return
}
// 字段的排序是依据tags的字段顺序，如果你不想使用默认的排序方式，可以直接定义 tags = []string{"字段名称", "字段名称2", ...}
tags, err := convert.GetEntityDescTags(sysin.ServeLogExportModel{})
if err != nil {
return err
return
}
var (
@@ -111,39 +100,28 @@ func (s *sSysServeLog) Export(ctx context.Context, in sysin.ServeLogListInp) (er
exports []sysin.ServeLogExportModel
)
err = gconv.Scan(list, &exports)
if err != nil {
if err = gconv.Scan(list, &exports); err != nil {
return err
}
if err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName); err != nil {
return
}
err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
return
}
// Delete 删除服务日志
func (s *sSysServeLog) Delete(ctx context.Context, in sysin.ServeLogDeleteInp) (err error) {
_, err = dao.SysServeLog.Ctx(ctx).Where(dao.SysServeLog.Columns().Id, in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// View 获取服务日志指定信息
func (s *sSysServeLog) View(ctx context.Context, in sysin.ServeLogViewInp) (res *sysin.ServeLogViewModel, err error) {
if err = dao.SysServeLog.Ctx(ctx).Where(dao.SysServeLog.Columns().Id, in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
}
return res, nil
err = dao.SysServeLog.Ctx(ctx).Where(dao.SysServeLog.Columns().Id, in.Id).Scan(&res)
return
}
// RealWrite 真实写入
func (s *sSysServeLog) RealWrite(ctx context.Context, models entity.SysServeLog) (err error) {
_, err = dao.SysServeLog.Ctx(ctx).Data(models).FieldsEx(dao.SysServeLog.Columns().Id).Insert()
_, err = dao.SysServeLog.Ctx(ctx).FieldsEx(dao.SysLog.Columns().Id).Data(models).Insert()
return
}

151
server/internal/logic/sys/sms_log.go
View File

@@ -18,6 +18,7 @@ import (
"hotgo/internal/library/sms"
"hotgo/internal/model"
"hotgo/internal/model/entity"
"hotgo/internal/model/input/form"
"hotgo/internal/model/input/sysin"
"hotgo/internal/service"
"hotgo/utility/validate"
@@ -35,93 +36,75 @@ func init() {
}
// Delete 删除
func (s *sSysSmsLog) Delete(ctx context.Context, in sysin.SmsLogDeleteInp) error {
_, err := dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Delete()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
func (s *sSysSmsLog) Delete(ctx context.Context, in sysin.SmsLogDeleteInp) (err error) {
_, err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sSysSmsLog) Edit(ctx context.Context, in sysin.SmsLogEditInp) (err error) {
if in.Ip == "" {
err = gerror.New("ip不能为空")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
if in.Id > 0 {
_, err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Data(in).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// 新增
in.CreatedAt = gtime.Now()
_, err = dao.SysSmsLog.Ctx(ctx).Data(in).Insert()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// Status 更新部门状态
func (s *sSysSmsLog) Status(ctx context.Context, in sysin.SmsLogStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return err
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return err
return
}
if !validate.InSliceInt(consts.StatusMap, in.Status) {
err = gerror.New("状态不正确")
return err
return
}
// 修改
in.UpdatedAt = gtime.Now()
_, err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return nil
return
}
// MaxSort 最大排序
func (s *sSysSmsLog) MaxSort(ctx context.Context, in sysin.SmsLogMaxSortInp) (*sysin.SmsLogMaxSortModel, error) {
var res sysin.SmsLogMaxSortModel
func (s *sSysSmsLog) MaxSort(ctx context.Context, in sysin.SmsLogMaxSortInp) (res *sysin.SmsLogMaxSortModel, err error) {
if in.Id > 0 {
if err := dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
if err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
}
res.Sort = res.Sort + 10
return &res, nil
if res == nil {
res = new(sysin.SmsLogMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// View 获取指定字典类型信息
func (s *sSysSmsLog) View(ctx context.Context, in sysin.SmsLogViewInp) (res *sysin.SmsLogViewModel, err error) {
if err = dao.SysSmsLog.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
return
}
return res, nil
return
}
// List 获取列表
@@ -165,31 +148,32 @@ func (s *sSysSmsLog) List(ctx context.Context, in sysin.SmsLogListInp) (list []*
// SendCode 发送验证码
func (s *sSysSmsLog) SendCode(ctx context.Context, in sysin.SendCodeInp) (err error) {
if in.Event == "" {
return gerror.New("事件不能为空")
err = gerror.New("事件不能为空")
return
}
if in.Mobile == "" {
return gerror.New("手机号不能为空")
err = gerror.New("手机号不能为空")
return
}
var models *entity.SysSmsLog
if err = dao.SysSmsLog.Ctx(ctx).Where("event", in.Event).Where("mobile", in.Mobile).Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
config, err := service.SysConfig().GetSms(ctx)
if err != nil {
return err
return
}
in.Template, err = s.GetTemplate(ctx, in.Event, config)
if err != nil {
return err
if in.Template, err = s.GetTemplate(ctx, in.Event, config); err != nil {
return
}
err = s.AllowSend(ctx, models, config)
if err != nil {
return err
if err = s.AllowSend(ctx, models, config); err != nil {
return
}
if in.Code == "" {
@@ -197,7 +181,7 @@ func (s *sSysSmsLog) SendCode(ctx context.Context, in sysin.SendCodeInp) (err er
}
if err = sms.New(config.SmsDrive).SendCode(ctx, in, config); err != nil {
return err
return
}
var data = new(entity.SysSmsLog)
@@ -210,29 +194,27 @@ func (s *sSysSmsLog) SendCode(ctx context.Context, in sysin.SendCodeInp) (err er
data.UpdatedAt = gtime.Now()
_, err = dao.SysSmsLog.Ctx(ctx).Data(data).Insert()
if err != nil {
return err
}
return nil
return
}
// GetTemplate 获取指定短信模板
func (s *sSysSmsLog) GetTemplate(ctx context.Context, template string, config *model.SmsConfig) (val string, err error) {
if template == "" {
return "", gerror.New("模板不能为空")
err = gerror.New("模板不能为空")
return
}
if config == nil {
config, err = service.SysConfig().GetSms(ctx)
if err != nil {
return "", err
return
}
}
switch config.SmsDrive {
case consts.SmsDriveAliYun:
if len(config.AliYunTemplate) == 0 {
return "", gerror.New("管理员还没有配置任何阿里云短信模板！")
err = gerror.New("管理员还没有配置任何阿里云短信模板！")
return
}
for _, v := range config.AliYunTemplate {
@@ -243,7 +225,8 @@ func (s *sSysSmsLog) GetTemplate(ctx context.Context, template string, config *m
case consts.SmsDriveTencent:
if len(config.TencentTemplate) == 0 {
return "", gerror.New("管理员还没有配置任何腾讯云短信模板！")
err = gerror.New("管理员还没有配置任何腾讯云短信模板！")
return
}
for _, v := range config.TencentTemplate {
@@ -252,7 +235,8 @@ func (s *sSysSmsLog) GetTemplate(ctx context.Context, template string, config *m
}
}
default:
return "", gerror.Newf("暂不支持短信驱动:%v", config.SmsDrive)
err = gerror.Newf("暂不支持短信驱动:%v", config.SmsDrive)
return
}
return
@@ -261,18 +245,18 @@ func (s *sSysSmsLog) GetTemplate(ctx context.Context, template string, config *m
// AllowSend 是否允许发送
func (s *sSysSmsLog) AllowSend(ctx context.Context, models *entity.SysSmsLog, config *model.SmsConfig) (err error) {
if models == nil {
return nil
return
}
if config == nil {
config, err = service.SysConfig().GetSms(ctx)
if err != nil {
return err
if config, err = service.SysConfig().GetSms(ctx); err != nil {
return
}
}
if gtime.Now().Before(models.CreatedAt.Add(time.Second * time.Duration(config.SmsMinInterval))) {
return gerror.New("发送频繁，请稍后再试！")
err = gerror.New("发送频繁，请稍后再试！")
return
}
if config.SmsMaxIpLimit > 0 {
@@ -282,7 +266,8 @@ func (s *sSysSmsLog) AllowSend(ctx context.Context, models *entity.SysSmsLog, co
}
if count >= config.SmsMaxIpLimit {
return gerror.New("今天发送短信过多，请次日后再试！")
err = gerror.New("今天发送短信过多，请次日后再试！")
return err
}
}
@@ -292,48 +277,52 @@ func (s *sSysSmsLog) AllowSend(ctx context.Context, models *entity.SysSmsLog, co
// VerifyCode 效验验证码
func (s *sSysSmsLog) VerifyCode(ctx context.Context, in sysin.VerifyCodeInp) (err error) {
if in.Event == "" {
return gerror.New("事件不能为空")
err = gerror.New("事件不能为空")
return
}
if in.Mobile == "" {
return gerror.New("手机号不能为空")
err = gerror.New("手机号不能为空")
return
}
config, err := service.SysConfig().GetSms(ctx)
if err != nil {
return err
return
}
var models *entity.SysSmsLog
if err = dao.SysSmsLog.Ctx(ctx).Where("event", in.Event).Where("mobile", in.Mobile).Order("id desc").Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
return
}
if models == nil {
return gerror.New("验证码错误")
err = gerror.New("验证码错误")
return
}
if models.Times >= 10 {
return gerror.New("验证码错误次数过多，请重新发送！")
err = gerror.New("验证码错误次数过多，请重新发送！")
return
}
if in.Event != consts.SmsTemplateCode {
if models.Status == consts.SmsStatusUsed {
return gerror.New("验证码已使用，请重新发送！")
err = gerror.New("验证码已使用，请重新发送！")
return
}
}
if gtime.Now().After(models.CreatedAt.Add(time.Second * time.Duration(config.SmsCodeExpire))) {
return gerror.New("验证码已过期，请重新发送")
err = gerror.New("验证码已过期，请重新发送")
return
}
if models.Code != in.Code {
_, err = dao.SysSmsLog.Ctx(ctx).Where("id", models.Id).Increment("times", 1)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
}
return gerror.New("验证码错误！")
dao.SysSmsLog.Ctx(ctx).Where("id", models.Id).Increment("times", 1)
err = gerror.New("验证码错误！")
return
}
_, err = dao.SysSmsLog.Ctx(ctx).Where("id", models.Id).Data(g.Map{

67
server/internal/logic/tcpclient/auth.go
View File

@@ -4,71 +4,84 @@ import (
"context"
"github.com/gogf/gf/v2/frame/g"
"hotgo/internal/library/network/tcp"
"hotgo/internal/model/input/msgin"
"hotgo/internal/service"
"hotgo/utility/simple"
)
// tcp授权
type sTCPAuth struct {
client *tcp.Client
// tcp客户端
type sAuthClient struct {
client *tcp.Client
summary *msgin.AuthSummaryData
}
func init() {
service.RegisterTCPAuth(newTCPAuth())
service.RegisterAuthClient(newAuthClient())
}
func newTCPAuth() *sTCPAuth {
return &sTCPAuth{}
func newAuthClient() *sAuthClient {
return &sAuthClient{}
}
// Start 启动服务
func (s *sTCPAuth) Start(ctx context.Context) {
g.Log().Debug(ctx, "TCPAuth start..")
func (s *sAuthClient) Start(ctx context.Context) {
g.Log().Debug(ctx, "AuthClient start..")
config, err := service.SysConfig().GetLoadTCP(ctx)
if err != nil {
g.Log().Errorf(ctx, "AuthClient start fail:%+v", err)
return
}
if config.Client == nil || config.Client.Auth == nil {
g.Log().Errorf(ctx, "AuthClient config is invalid")
return
}
simple.SafeGo(ctx, func(ctx context.Context) {
client, err := tcp.NewClient(&tcp.ClientConfig{
Addr: "127.0.0.1:8099",
s.client, err = tcp.NewClient(&tcp.ClientConfig{
Addr: config.Client.Auth.Address,
Auth: &tcp.AuthMeta{
Group: "auth",
Name: "auth1",
AppId: "mengshuai",
SecretKey: "123456",
Group: config.Client.Auth.Group,
Name: config.Client.Auth.Name,
AppId: config.Client.Auth.AppId,
SecretKey: config.Client.Auth.SecretKey,
},
LoginEvent: s.onLoginEvent,
CloseEvent: s.onCloseEvent,
})
if err != nil {
g.Log().Infof(ctx, "TCPAuth NewClient fail：%+v", err)
g.Log().Errorf(ctx, "AuthClient NewClient fail：%+v", err)
return
}
s.client = client
err = s.client.RegisterRouter(map[string]tcp.RouterHandler{
// ...
"ResponseAuthSummary": s.OnResponseAuthSummary,
})
if err != nil {
g.Log().Infof(ctx, "TCPAuth RegisterRouter fail：%+v", err)
g.Log().Errorf(ctx, "AuthClient RegisterRouter fail：%+v", err)
return
}
if err = s.client.Start(); err != nil {
g.Log().Infof(ctx, "TCPAuth Start fail：%+v", err)
g.Log().Errorf(ctx, "AuthClient Start fail：%+v", err)
return
}
})
}
// Stop 停止服务
func (s *sTCPAuth) Stop(ctx context.Context) {
func (s *sAuthClient) Stop(ctx context.Context) {
if s.client != nil {
s.client.Stop()
g.Log().Debug(ctx, "TCPAuth stop..")
g.Log().Debug(ctx, "AuthClient stop..")
}
}
// IsLogin 是否已登录认证
func (s *sTCPAuth) IsLogin() bool {
func (s *sAuthClient) IsLogin() bool {
if s.client == nil {
return false
}
@@ -76,11 +89,13 @@ func (s *sTCPAuth) IsLogin() bool {
}
// onLoginEvent 登录认证成功事件
func (s *sTCPAuth) onLoginEvent() {
// ...
func (s *sAuthClient) onLoginEvent() {
// 获取授权数据
s.client.Send(s.client.Ctx, &msgin.AuthSummary{})
}
// onCloseEvent 连接关闭回调事件
func (s *sTCPAuth) onCloseEvent() {
func (s *sAuthClient) onCloseEvent() {
// ...
}

24
server/internal/logic/tcpclient/auth_handle.go Normal file
View File

@@ -0,0 +1,24 @@
package tcpclient
import (
"context"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/model/input/msgin"
)
// OnResponseAuthSummary 获取授权信息
func (s *sAuthClient) OnResponseAuthSummary(ctx context.Context, args ...interface{}) {
var in *msgin.ResponseAuthSummary
if err := gconv.Scan(args[0], &in); err != nil {
s.client.Logger.Warningf(ctx, "OnResponseAuthSummary Scan err:+v", err)
return
}
if err := in.GetError(); err != nil {
s.client.Logger.Warningf(ctx, "OnResponseAuthSummary GetError :+v", err)
return
}
// 拿到授权的数据，可以是一些动态的功能、路由、权限控制等
s.summary = in.Data
}

1
server/internal/logic/tcpclient/client.go Normal file
View File

@@ -0,0 +1 @@
package tcpclient

102
server/internal/logic/tcpclient/cron.go Normal file
View File

@@ -0,0 +1,102 @@
package tcpclient
import (
"context"
"github.com/gogf/gf/v2/frame/g"
"hotgo/internal/library/network/tcp"
"hotgo/internal/service"
"hotgo/utility/simple"
)
// tcp客户端
type sCronClient struct {
client *tcp.Client
}
func init() {
service.RegisterCronClient(newCronClient())
}
func newCronClient() *sCronClient {
return &sCronClient{}
}
// Start 启动服务
func (s *sCronClient) Start(ctx context.Context) {
g.Log().Debug(ctx, "CronClient start..")
config, err := service.SysConfig().GetLoadTCP(ctx)
if err != nil {
g.Log().Errorf(ctx, "CronClient start fail:%+v", err)
return
}
if config.Client == nil || config.Client.Cron == nil {
g.Log().Errorf(ctx, "CronClient config is invalid")
return
}
simple.SafeGo(ctx, func(ctx context.Context) {
client, err := tcp.NewClient(&tcp.ClientConfig{
Addr: config.Client.Cron.Address,
Auth: &tcp.AuthMeta{
Group: config.Client.Cron.Group,
Name: config.Client.Cron.Name,
AppId: config.Client.Cron.AppId,
SecretKey: config.Client.Cron.SecretKey,
},
LoginEvent: s.onLoginEvent,
CloseEvent: s.onCloseEvent,
})
if err != nil {
g.Log().Errorf(ctx, "CronClient NewClient fail：%+v", err)
return
}
s.client = client
err = s.client.RegisterRouter(map[string]tcp.RouterHandler{
"CronDelete": s.OnCronDelete, // 删除任务
"CronEdit": s.OnCronEdit, // 编辑任务
"CronStatus": s.OnCronStatus, // 修改任务状态
"CronOnlineExec": s.OnCronOnlineExec, // 执行一次任务
})
if err != nil {
g.Log().Errorf(ctx, "CronClient RegisterRouter fail：%+v", err)
return
}
if err = s.client.Start(); err != nil {
g.Log().Errorf(ctx, "CronClient Start fail：%+v", err)
return
}
})
}
// Stop 停止服务
func (s *sCronClient) Stop(ctx context.Context) {
if s.client != nil {
s.client.Stop()
g.Log().Debug(ctx, "CronClient stop..")
}
}
// IsLogin 是否已登录认证
func (s *sCronClient) IsLogin() bool {
if s.client == nil {
return false
}
return s.client.IsLogin
}
// onLoginEvent 登录认证成功事件
func (s *sCronClient) onLoginEvent() {
// ...
}
// onCloseEvent 连接关闭回调事件
func (s *sCronClient) onCloseEvent() {
// ...
}

96
server/internal/logic/tcpclient/cron_handle.go Normal file
View File

@@ -0,0 +1,96 @@
package tcpclient
import (
"context"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/model/input/msgin"
"hotgo/internal/service"
)
// OnCronDelete 删除任务
func (s *sCronClient) OnCronDelete(ctx context.Context, args ...interface{}) {
var (
in *msgin.CronDelete
res = new(msgin.ResponseCronDelete)
)
if err := gconv.Scan(args[0], &in); err != nil {
res.Code = 1
res.Message = err.Error()
s.client.Reply(ctx, res)
return
}
if err := service.SysCron().Delete(ctx, in.CronDeleteInp); err != nil {
res.Code = 2
res.Message = err.Error()
}
s.client.Reply(ctx, res)
}
// OnCronEdit 编辑任务
func (s *sCronClient) OnCronEdit(ctx context.Context, args ...interface{}) {
var (
in *msgin.CronEdit
res = new(msgin.ResponseCronEdit)
)
if err := gconv.Scan(args[0], &in); err != nil {
res.Code = 1
res.Message = err.Error()
s.client.Reply(ctx, res)
return
}
if err := service.SysCron().Edit(ctx, in.CronEditInp); err != nil {
res.Code = 2
res.Message = err.Error()
}
s.client.Reply(ctx, res)
}
// OnCronStatus 修改任务状态
func (s *sCronClient) OnCronStatus(ctx context.Context, args ...interface{}) {
var (
in *msgin.CronStatus
res = new(msgin.ResponseCronStatus)
)
if err := gconv.Scan(args[0], &in); err != nil {
res.Code = 1
res.Message = err.Error()
s.client.Reply(ctx, res)
return
}
if err := service.SysCron().Status(ctx, in.CronStatusInp); err != nil {
res.Code = 2
res.Message = err.Error()
}
s.client.Reply(ctx, res)
}
// OnCronOnlineExec 执行一次任务
func (s *sCronClient) OnCronOnlineExec(ctx context.Context, args ...interface{}) {
var (
in *msgin.CronOnlineExec
res = new(msgin.ResponseCronOnlineExec)
)
if err := gconv.Scan(args[0], &in); err != nil {
res.Code = 1
res.Message = err.Error()
s.client.Reply(ctx, res)
return
}
if err := service.SysCron().OnlineExec(ctx, in.OnlineExecInp); err != nil {
res.Code = 1
res.Message = err.Error()
}
s.client.Reply(ctx, res)
}

47
server/internal/logic/tcpserver/auth_handle.go
View File

@@ -1,6 +1,7 @@
package tcpserver
import (
"context"
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/consts"
@@ -10,64 +11,66 @@ import (
"hotgo/internal/model/input/msgin"
)
// onAuthSummary 获取授权信息
func (s *sTCPServer) onAuthSummary(args ...interface{}) {
// OnAuthSummary 获取授权信息
func (s *sTCPServer) OnAuthSummary(ctx context.Context, args ...interface{}) {
var (
in *msgin.AuthSummary
client = args[1].(*tcp.ClientConn)
user = tcp.GetCtx(ctx)
res = new(msgin.ResponseAuthSummary)
models *entity.SysServeLicense
)
if err := gconv.Scan(args, &in); err != nil {
s.serv.Logger.Infof(s.serv.Ctx, "onAuthSummary message Scan failed:%+v, args:%+v", err, args)
return
}
if client.Auth == nil {
res.Code = 1
res.Message = "登录信息获取失败，请重新登录"
s.serv.Write(client.Conn, res)
res.Message = err.Error()
s.serv.Reply(ctx, res)
return
}
if err := dao.SysServeLicense.Ctx(s.serv.Ctx).Where("appid = ?", client.Auth.AppId).Scan(&models); err != nil {
if user.Auth == nil {
res.Code = 2
res.Message = "登录信息获取失败，请重新登录"
s.serv.Reply(ctx, res)
return
}
if err := dao.SysServeLicense.Ctx(ctx).Where("appid = ?", user.Auth.AppId).Scan(&models); err != nil {
res.Code = 3
res.Message = err.Error()
s.serv.Write(client.Conn, res)
s.serv.Reply(ctx, res)
return
}
if models == nil {
res.Code = 3
res.Code = 4
res.Message = "授权信息不存在"
s.serv.Write(client.Conn, res)
s.serv.Reply(ctx, res)
return
}
if models.Status != consts.StatusEnabled {
res.Code = 4
res.Code = 5
res.Message = "授权已禁用，请联系管理员"
s.serv.Write(client.Conn, res)
s.serv.Reply(ctx, res)
return
}
if models.Group != client.Auth.Group {
res.Code = 5
if models.Group != user.Auth.Group {
res.Code = 6
res.Message = "你登录的授权分组未得到授权，请联系管理员"
s.serv.Write(client.Conn, res)
s.serv.Reply(ctx, res)
return
}
if models.EndAt.Before(gtime.Now()) {
res.Code = 6
res.Code = 7
res.Message = "授权已过期，请联系管理员"
s.serv.Write(client.Conn, res)
s.serv.Reply(ctx, res)
return
}
res.Data = new(msgin.AuthSummaryData)
res.Data.EndAt = models.EndAt
res.Data.Online = models.Online
s.serv.Write(client.Conn, res)
s.serv.Reply(ctx, res)
}

117
server/internal/logic/tcpserver/cron_handle.go Normal file
View File

@@ -0,0 +1,117 @@
package tcpserver
import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/util/gconv"
"hotgo/internal/consts"
"hotgo/internal/model/input/msgin"
)
// CronDelete 删除任务
func (s *sTCPServer) CronDelete(ctx context.Context, in *msgin.CronDelete) (err error) {
clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
if len(clients) == 0 {
err = gerror.New("没有在线的定时任务服务")
return
}
for _, client := range clients {
res, err := s.serv.RpcRequest(ctx, client, in)
if err != nil {
return err
}
var resp = new(msgin.ResponseCronDelete)
if err = gconv.Scan(res, &resp); err != nil {
return err
}
if err = resp.GetError(); err != nil {
return err
}
}
return
}
// CronEdit 编辑任务
func (s *sTCPServer) CronEdit(ctx context.Context, in *msgin.CronEdit) (err error) {
clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
if len(clients) == 0 {
err = gerror.New("没有在线的定时任务服务")
return
}
for _, client := range clients {
res, err := s.serv.RpcRequest(ctx, client, in)
if err != nil {
return err
}
var resp = new(msgin.ResponseCronEdit)
if err = gconv.Scan(res, &resp); err != nil {
return err
}
if err = resp.GetError(); err != nil {
return err
}
}
return
}
// CronStatus 修改任务状态
func (s *sTCPServer) CronStatus(ctx context.Context, in *msgin.CronStatus) (err error) {
clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
if len(clients) == 0 {
err = gerror.New("没有在线的定时任务服务")
return
}
for _, client := range clients {
res, err := s.serv.RpcRequest(ctx, client, in)
if err != nil {
return err
}
var resp = new(msgin.ResponseCronStatus)
if err = gconv.Scan(res, &resp); err != nil {
return err
}
if err = resp.GetError(); err != nil {
return err
}
}
return
}
// CronOnlineExec 执行一次任务
func (s *sTCPServer) CronOnlineExec(ctx context.Context, in *msgin.CronOnlineExec) (err error) {
clients := s.serv.GetGroupClients(consts.TCPClientGroupCron)
if len(clients) == 0 {
err = gerror.New("没有在线的定时任务服务")
return
}
for _, client := range clients {
res, err := s.serv.RpcRequest(ctx, client, in)
if err != nil {
return err
}
var resp = new(msgin.ResponseCronOnlineExec)
if err = gconv.Scan(res, &resp); err != nil {
return err
}
if err = resp.GetError(); err != nil {
return err
}
}
return
}

4
server/internal/logic/tcpserver/init.go → server/internal/logic/tcpserver/server.go
View File

@@ -27,7 +27,7 @@ func (s *sTCPServer) Start(ctx context.Context) {
server, err := tcp.NewServer(&tcp.ServerConfig{
Name: "hotgo",
Addr: g.Cfg().MustGet(ctx, "tcpServe.address").String(),
Addr: g.Cfg().MustGet(ctx, "tcp.server.address").String(),
})
if err != nil {
@@ -49,7 +49,7 @@ func (s *sTCPServer) Start(ctx context.Context) {
// 授权服务路由
s.serv.RegisterAuthRouter(map[string]tcp.RouterHandler{
"AuthSummary": s.onAuthSummary, // 获取授权信息
"AuthSummary": s.OnAuthSummary, // 获取授权信息
})
// 服务监听