mirror of
https://github.com/bufanyun/hotgo.git
synced 2025-08-28 05:12:32 +08:00
add golangci-lint.
This commit is contained in:
@@ -121,7 +121,6 @@ func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*
|
||||
v.MemberUser = member.Username
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@@ -250,7 +249,6 @@ func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err er
|
||||
err = gerror.Newf("申请提现失败, %+v", err)
|
||||
return
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@@ -8,7 +8,6 @@ package admin
|
||||
import (
|
||||
"context"
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"hotgo/internal/consts"
|
||||
"hotgo/internal/dao"
|
||||
"hotgo/internal/model/entity"
|
||||
"hotgo/internal/service"
|
||||
@@ -24,40 +23,22 @@ func init() {
|
||||
service.RegisterAdminMemberPost(NewAdminMemberPost())
|
||||
}
|
||||
|
||||
// UpdatePostIds 更新用户岗位
|
||||
func (s *sAdminMemberPost) UpdatePostIds(ctx context.Context, memberId int64, postIds []int64) (err error) {
|
||||
_, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", memberId).Delete()
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, "删除失败")
|
||||
if _, err = dao.AdminMemberPost.Ctx(ctx).Where(dao.AdminMemberPost.Columns().MemberId, memberId).Delete(); err != nil {
|
||||
err = gerror.Wrap(err, "清理用户旧岗位数据失败,请稍后重试!")
|
||||
return
|
||||
}
|
||||
|
||||
for i := 0; i < len(postIds); i++ {
|
||||
_, err = dao.AdminMemberPost.Ctx(ctx).
|
||||
Insert(entity.AdminMemberPost{
|
||||
MemberId: memberId,
|
||||
PostId: postIds[i],
|
||||
})
|
||||
_, err = dao.AdminMemberPost.Ctx(ctx).Insert(entity.AdminMemberPost{
|
||||
MemberId: memberId,
|
||||
PostId: postIds[i],
|
||||
})
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, "插入用户岗位失败")
|
||||
err = gerror.Wrap(err, "加入用户岗位数据失败,请稍后重试!")
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
if err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return
|
||||
}
|
||||
|
||||
for i := 0; i < len(list); i++ {
|
||||
postIds = append(postIds, list[i].PostId)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
@@ -260,6 +260,5 @@ func (s *sAdminSite) handleLogin(ctx context.Context, mb *entity.AdminMember) (r
|
||||
Token: loginToken,
|
||||
Expires: expires,
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
@@ -144,7 +144,6 @@ func (s *sSysAttachment) List(ctx context.Context, in sysin.AttachmentListInp) (
|
||||
v.SizeFormat = format.FileSize(v.Size)
|
||||
v.FileUrl = service.CommonUpload().LastUrl(ctx, conf, v.FileUrl, v.Drive)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@@ -25,33 +25,6 @@ import (
|
||||
"hotgo/utility/simple"
|
||||
)
|
||||
|
||||
// MaskDemoField 演示环境下需要隐藏的配置
|
||||
var MaskDemoField = []string{
|
||||
// 邮箱
|
||||
"smtpUser", "smtpPass",
|
||||
|
||||
// 云存储
|
||||
"uploadUCloudPublicKey", "uploadUCloudPrivateKey",
|
||||
"uploadCosSecretId", "uploadCosSecretKey",
|
||||
"uploadOssSecretId", "uploadOssSecretKey",
|
||||
"uploadQiNiuAccessKey", "uploadQiNiuSecretKey",
|
||||
|
||||
// 地图
|
||||
"geoAmapWebKey",
|
||||
|
||||
// 短信
|
||||
"smsAliYunAccessKeyID", "smsAliYunAccessKeySecret",
|
||||
"smsTencentSecretId", "smsTencentSecretKey",
|
||||
|
||||
// 支付
|
||||
"payWxPayMchId", "payWxPaySerialNo", "payWxPayAPIv3Key",
|
||||
"payWxPayPrivateKey", "payQQPayMchId", "payQQPayApiKey",
|
||||
|
||||
// 微信
|
||||
"officialAccountAppSecret", "officialAccountToken", "officialAccountEncodingAESKey",
|
||||
"openPlatformAppSecret", "openPlatformToken", "openPlatformEncodingAESKey",
|
||||
}
|
||||
|
||||
type sSysConfig struct{}
|
||||
|
||||
func NewSysConfig() *sSysConfig {
|
||||
|
@@ -291,7 +291,8 @@ func (s *sSysGenCodes) Preview(ctx context.Context, in sysin.GenCodesPreviewInp)
|
||||
// Build 提交生成
|
||||
func (s *sSysGenCodes) Build(ctx context.Context, in sysin.GenCodesBuildInp) (err error) {
|
||||
// 先保存配置
|
||||
if _, err = s.Edit(ctx, sysin.GenCodesEditInp{SysGenCodes: in.SysGenCodes}); err != nil {
|
||||
ein := in.SysGenCodes
|
||||
if _, err = s.Edit(ctx, sysin.GenCodesEditInp{SysGenCodes: ein}); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
}
|
||||
|
Reference in New Issue
Block a user