github_mirrors/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-08-28 05:12:32 +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) {