Merge pull request #42 from bufanyun/v2.0

优化服务监控定时器，移除notify功能包,修复部门和角色树列表部分情况无法自动展开问题

server/api/admin/smslog/smslog.go

@@ -1,3 +1,8 @@
+// Package smslog
+// @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 smslog
 
 import (

server/api/api/pay/notify.go

@@ -1,3 +1,8 @@
+// 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 (

server/api/servmsg/auth.go

@@ -1,3 +1,8 @@
+// Package servmsg
+// @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 servmsg
 
 import (

server/api/servmsg/cron.go

@@ -1,3 +1,8 @@
+// Package servmsg
+// @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 servmsg
 
 import (

server/api/servmsg/example.go

@@ -1,3 +1,8 @@
+// Package servmsg
+// @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 servmsg
 
 import (

server/api/websocket/base/send.go

@@ -1,3 +1,8 @@
+// Package base
+// @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 base
 
 import (

server/internal/consts/event.go

@@ -1,3 +1,8 @@
+// Package consts
+// @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 consts
 
 const (

server/internal/consts/http.go

@@ -1,3 +1,8 @@
+// Package consts
+// @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 consts
 
 const (

server/internal/consts/servelicense.go

@@ -1,3 +1,8 @@
+// Package consts
+// @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 consts
 
 // 授权分组

server/internal/consts/wechat.go

@@ -1,3 +1,8 @@
+// Package consts
+// @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 consts
 
 // 授权类型

server/internal/controller/admin/admin/monitor.go

@@ -130,6 +130,8 @@ func (c *cMonitor) NetOnlineList(ctx context.Context, req *monitor.NetOnlineList
 
 	conns := serv.GetClients()
 	if len(conns) == 0 {
+		res = new(monitor.NetOnlineListRes)
+		res.PageRes.Pack(req, 0)
 		return
 	}
 

server/internal/controller/admin/admin/role.go

@@ -70,7 +70,7 @@ func (c *cRole) UpdatePermissions(ctx context.Context, req *role.UpdatePermissio
 // DataScopeSelect 获取数据权限选项
 func (c *cRole) DataScopeSelect(_ context.Context, _ *role.DataScopeSelectReq) (res *role.DataScopeSelectRes, err error) {
 	res = new(role.DataScopeSelectRes)
-	res.List = consts.DataScopeSelect //service.AdminRole().DataScopeSelect()
+	res.List = consts.DataScopeSelect
 	return
 }
 

server/internal/dao/admin_dept.go

@@ -5,11 +5,7 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"hotgo/internal/consts"
 	"hotgo/internal/dao/internal"
-	"hotgo/internal/model/entity"
 )
 
 // internalAdminDeptDao is internal type for wrapping internal DAO implements.
@@ -28,23 +24,4 @@ var (
 	}
 )
 
-// IsUniqueName 判断名称是否唯一
+// Fill with you ideas below.
-func (dao *adminDeptDao) IsUniqueName(ctx context.Context, id int64, name string) (bool, error) {
-	var data *entity.AdminDept
-	m := dao.Ctx(ctx).Where("name", name)
-
-	if id > 0 {
-		m = m.WhereNot("id", id)
-	}
-
-	if err := m.Scan(&data); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return false, err
-	}
-
-	if data == nil {
-		return true, nil
-	}
-
-	return false, nil
-}

server/internal/dao/admin_member_post.go

@@ -5,10 +5,7 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/errors/gerror"
 	"hotgo/internal/dao/internal"
-	"hotgo/internal/model/entity"
 )
 
 // internalAdminMemberPostDao is internal type for wrapping internal DAO implements.
@@ -27,27 +24,4 @@ var (
 	}
 )
 
-// UpdatePostIds 更新管理员岗位
+// Fill with you ideas below.
-func (dao *adminMemberPostDao) UpdatePostIds(ctx context.Context, memberId int64, postIds []int64) (err error) {
-	_, err = dao.Ctx(ctx).
-		Where("member_id", memberId).
-		Delete()
-	if err != nil {
-		err = gerror.Wrap(err, "删除失败")
-		return err
-	}
-
-	for i := 0; i < len(postIds); i++ {
-		_, err = dao.Ctx(ctx).
-			Insert(entity.AdminMemberPost{
-				MemberId: memberId,
-				PostId:   postIds[i],
-			})
-		if err != nil {
-			err = gerror.Wrap(err, "插入用户岗位失败")
-			return err
-		}
-	}
-
-	return nil
-}

server/internal/dao/admin_menu.go

@@ -23,3 +23,5 @@ var (
 		internal.NewAdminMenuDao(),
 	}
 )
+
+// Fill with you ideas below.

server/internal/dao/admin_post.go

@@ -5,11 +5,7 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"hotgo/internal/consts"
 	"hotgo/internal/dao/internal"
-	"hotgo/internal/model/entity"
 )
 
 // internalAdminPostDao is internal type for wrapping internal DAO implements.
@@ -28,44 +24,4 @@ var (
 	}
 )
 
-// IsUniqueName 判断名称是否唯一
+// Fill with you ideas below.
-func (dao *adminPostDao) IsUniqueName(ctx context.Context, id int64, name string) (bool, error) {
-	var data *entity.AdminPost
-	m := dao.Ctx(ctx).Where("name", name)
-
-	if id > 0 {
-		m = m.WhereNot("id", id)
-	}
-
-	if err := m.Scan(&data); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return false, err
-	}
-
-	if data == nil {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-// IsUniqueCode 判断编码是否唯一
-func (dao *adminPostDao) IsUniqueCode(ctx context.Context, id int64, code string) (bool, error) {
-	var data *entity.AdminPost
-	m := dao.Ctx(ctx).Where("code", code)
-
-	if id > 0 {
-		m = m.WhereNot("id", id)
-	}
-
-	if err := m.Scan(&data); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return false, err
-	}
-
-	if data == nil {
-		return true, nil
-	}
-
-	return false, nil
-}

server/internal/dao/admin_role.go

@@ -5,11 +5,7 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"hotgo/internal/consts"
 	"hotgo/internal/dao/internal"
-	"hotgo/internal/model/entity"
 )
 
 // internalAdminRoleDao is internal type for wrapping internal DAO implements.
@@ -28,44 +24,4 @@ var (
 	}
 )
 
-// IsUniqueName 判断名称是否唯一
+// Fill with you ideas below.
-func (dao *adminRoleDao) IsUniqueName(ctx context.Context, id int64, name string) (bool, error) {
-	var data *entity.AdminRole
-	m := dao.Ctx(ctx).Where("name", name)
-
-	if id > 0 {
-		m = m.WhereNot("id", id)
-	}
-
-	if err := m.Scan(&data); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return false, err
-	}
-
-	if data == nil {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-// IsUniqueCode 判断编码是否唯一
-func (dao *adminRoleDao) IsUniqueCode(ctx context.Context, id int64, code string) (bool, error) {
-	var data *entity.AdminRole
-	m := dao.Ctx(ctx).Where("key", code)
-
-	if id > 0 {
-		m = m.WhereNot("id", id)
-	}
-
-	if err := m.Scan(&data); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return false, err
-	}
-
-	if data == nil {
-		return true, nil
-	}
-
-	return false, nil
-}

server/internal/dao/sys_attachment.go

@@ -23,3 +23,5 @@ var (
 		internal.NewSysAttachmentDao(),
 	}
 )
+
+// Fill with you ideas below.

server/internal/dao/sys_cron_group.go

@@ -5,9 +5,6 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"hotgo/internal/consts"
 	"hotgo/internal/dao/internal"
 )
 
@@ -27,14 +24,4 @@ var (
 	}
 )
 
-// GetName 获取分组名称
+// Fill with you ideas below.
-func (dao *sysCronGroupDao) GetName(ctx context.Context, id int64) (name string, err error) {
-	m := dao.Ctx(ctx).Fields("name").Where("id", id)
-	list, err := m.Value()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return name, err
-	}
-
-	return list.String(), nil
-}

server/internal/dao/sys_dict_type.go

@@ -5,12 +5,7 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"hotgo/internal/consts"
 	"hotgo/internal/dao/internal"
-	"hotgo/internal/model/entity"
 )
 
 // internalSysDictTypeDao is internal type for wrapping internal DAO implements.
@@ -30,60 +25,3 @@ var (
 )
 
 // Fill with you ideas below.
-
-// IsUniqueType 判断类型是否唯一
-func (dao *sysDictTypeDao) IsUniqueType(ctx context.Context, id int64, typeName string) (bool, error) {
-	var data *entity.SysDictType
-	m := dao.Ctx(ctx).Where("type", typeName)
-
-	if id > 0 {
-		m = m.WhereNot("id", id)
-	}
-
-	if err := m.Scan(&data); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return false, err
-	}
-
-	if data == nil {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-// GetTypes 获取指定ID的所有类型标识，包含下级
-func (dao *sysDictTypeDao) GetTypes(ctx context.Context, id int64) (types []string, err error) {
-	columns, err := dao.Ctx(ctx).Fields("type").
-		Where("id", id).
-		WhereOr("pid", id).
-		Where("status", consts.StatusEnabled).Array()
-	types = g.NewVar(columns).Strings()
-	return
-}
-
-// GetType 获取指定ID的类型标识
-func (dao *sysDictTypeDao) GetType(ctx context.Context, id int64) (types string, err error) {
-	m := dao.Ctx(ctx).Fields("type").Where("id", id).
-		Where("status", consts.StatusEnabled)
-	list, err := m.Value()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return types, err
-	}
-
-	return list.String(), nil
-}
-
-// GetId 获取指定类型的ID
-func (dao *sysDictTypeDao) GetId(ctx context.Context, t string) (id int64, err error) {
-	m := dao.Ctx(ctx).Fields("id").Where("type", t).
-		Where("status", consts.StatusEnabled)
-	list, err := m.Value()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return 0, err
-	}
-
-	return list.Int64(), nil
-}

server/internal/dao/sys_ems_log.go

@@ -5,8 +5,6 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/os/gtime"
 	"hotgo/internal/dao/internal"
 )
 
@@ -27,17 +25,3 @@ var (
 )
 
 // Fill with you ideas below.
-
-// NowDayCount 当天发送次数
-func (dao *sysEmsLogDao) NowDayCount(ctx context.Context, event, email string) (count int, err error) {
-	count, err = dao.Ctx(ctx).
-		Where("email", email).
-		Where("event", event).
-		WhereGTE("created_at", gtime.Now().Format("Y-m-d")).
-		Count()
-	if err != nil {
-		return 0, err
-	}
-
-	return
-}

server/internal/dao/sys_sms_log.go

@@ -5,8 +5,6 @@
 package dao
 
 import (
-	"context"
-	"github.com/gogf/gf/v2/os/gtime"
 	"hotgo/internal/dao/internal"
 )
 
@@ -27,17 +25,3 @@ var (
 )
 
 // Fill with you ideas below.
-
-// NowDayCount 当天发送次数
-func (dao *sysSmsLogDao) NowDayCount(ctx context.Context, event, mobile string) (count int, err error) {
-	count, err = dao.Ctx(ctx).
-		Where("mobile", mobile).
-		Where("event", event).
-		WhereGTE("created_at", gtime.Now().Format("Y-m-d")).
-		Count()
-	if err != nil {
-		return 0, err
-	}
-
-	return
-}

server/internal/global/cluster.go

@@ -41,14 +41,13 @@ func PublishClusterSync(ctx context.Context, channel string, message interface{}
 	}
 
 	mutex := lock.Mutex(fmt.Sprintf("%s:%s", "lock", channel))
-	if err := mutex.Lock(ctx); err != nil {
+	err := mutex.LockFunc(ctx, func() {
-		g.Log().Warningf(ctx, "PublishClusterSync %v lock err:%v", channel, err)
+		if _, err := pubsub.Publish(ctx, channel, message); err != nil {
-		return
+			g.Log().Warningf(ctx, "PublishClusterSync %v err:%v", channel, err)
-	}
+		}
-	_ = mutex.Unlock(ctx)
+	})
-
+	if err != nil {
-	if _, err := pubsub.Publish(ctx, channel, message); err != nil {
+		g.Log().Warningf(ctx, "PublishClusterSync %v LockFunc err:%v", channel, err)
-		g.Log().Warningf(ctx, "PublishClusterSync %v err:%v", channel, err)
 	}
 	return
 }

server/internal/library/addons/build.go

@@ -1,3 +1,8 @@
+// Package addons
+// @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 addons
 
 import (

server/internal/library/addons/build_layout.go

@@ -1,3 +1,8 @@
+// Package addons
+// @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 addons
 
 const (

server/internal/library/cache/file/file.go

@@ -1,3 +1,8 @@
+// Package file
+// @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 file
 
 import (

server/internal/library/contexts/detached.go

@@ -1,3 +1,8 @@
+// Package contexts
+// @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 contexts
 
 import (

server/internal/library/hgrds/lock/lock.go

@@ -116,6 +116,33 @@ func (l *Lock) Unlock(ctx context.Context) error {
 	return err
 }
 
+func (l *Lock) LockFunc(ctx context.Context, f func()) error {
+	if err := l.Lock(ctx); err != nil {
+		return err
+	}
+	defer func() {
+		_ = l.Unlock(ctx)
+	}()
+	f()
+	return nil
+}
+
+// TryLockFunc tries locking the mutex for writing with given callback function `f`.
+// it returns true immediately if success, or if there's a lock on the mutex,
+// it returns error immediately.
+//
+// It releases the lock after `f` is executed.
+func (l *Lock) TryLockFunc(ctx context.Context, f func()) error {
+	err := l.TryLock(ctx)
+	if err != nil {
+		defer func() {
+			_ = l.Unlock(ctx)
+		}()
+		f()
+	}
+	return err
+}
+
 // startWatchDog 看门狗
 func (l *Lock) startWatchDog() {
 	resetTTLInterval := l.ttl / 3

server/internal/library/hgrds/pubsub/subscribe.go

@@ -32,9 +32,6 @@ func SubscribeMap(channels map[string]SubHandler) (err error) {
 		return
 	}
 
-	subscribes.mutex.Lock()
-	defer subscribes.mutex.Unlock()
-
 	for channel, hr := range channels {
 		if err = Subscribe(channel, hr); err != nil {
 			return

server/internal/library/notify/feishu/client.go

@@ -1,79 +0,0 @@
-package feishu
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
-	"strconv"
-	"time"
-
-	"hotgo/internal/library/notify/feishu/internal/security"
-)
-
-const feishuAPI = "https://open.feishu.cn/open-apis/bot/v2/hook/"
-
-// Client feishu client
-type Client struct {
-	AccessToken string
-	Secret      string
-}
-
-// NewClient new client
-func NewClient(accessToken, secret string) *Client {
-	return &Client{
-		AccessToken: accessToken,
-		Secret:      secret,
-	}
-}
-
-// Response response struct
-type Response struct {
-	Code int64       `json:"code"`
-	Msg  string      `json:"msg"`
-	Data interface{} `json:"data"`
-
-	Extra         interface{} `json:"Extra"`
-	StatusCode    int64       `json:"StatusCode"`
-	StatusMessage string      `json:"StatusMessage"`
-}
-
-// Send send message
-func (d *Client) Send(message Message) (string, *Response, error) {
-	res := &Response{}
-
-	if len(d.AccessToken) < 1 {
-		return "", res, fmt.Errorf("accessToken is empty")
-	}
-
-	timestamp := time.Now().Unix()
-	sign, err := security.GenSign(d.Secret, timestamp)
-	if err != nil {
-		return "", res, err
-	}
-
-	body := message.Body()
-	body["timestamp"] = strconv.FormatInt(timestamp, 10)
-	body["sign"] = sign
-
-	reqBytes, err := json.Marshal(body)
-	if err != nil {
-		return "", res, err
-	}
-
-	var (
-		result    *Response
-		URL       = fmt.Sprintf("%v%v", feishuAPI, d.AccessToken)
-		reqString = string(reqBytes)
-	)
-
-	g.Client().
-		Retry(3, time.Second).
-		SetHeader("Accept", "application/json").
-		SetHeader("Content-Type", "application/json").
-		PostVar(gctx.New(), URL, &result)
-	if result.Code != 0 {
-		return reqString, result, fmt.Errorf("send message to feishu error = %s", result.Msg)
-	}
-	return reqString, result, nil
-}

server/internal/library/notify/feishu/image.go

@@ -1,24 +0,0 @@
-package feishu
-
-type ImageMessage struct {
-	MsgType MsgType      `json:"msg_type"`
-	Content ImageContent `json:"content"`
-}
-
-type ImageContent struct {
-	ImageKey string `json:"image_key"`
-}
-
-func (m *ImageMessage) Body() map[string]interface{} {
-	m.MsgType = MsgTypeImage
-	return structToMap(m)
-}
-
-func NewImageMessage() *ImageMessage {
-	return &ImageMessage{}
-}
-
-func (m *ImageMessage) SetImageKey(key string) *ImageMessage {
-	m.Content.ImageKey = key
-	return m
-}

server/internal/library/notify/feishu/interactive.go

@@ -1,21 +0,0 @@
-package feishu
-
-type InteractiveMessage struct {
-	MsgType MsgType `json:"msg_type"`
-	Card    string  `json:"card"`
-}
-
-func (m *InteractiveMessage) Body() map[string]interface{} {
-	m.MsgType = MsgTypeInteractive
-	return structToMap(m)
-}
-
-func NewInteractiveMessage() *InteractiveMessage {
-	return &InteractiveMessage{}
-}
-
-// SetCard set card with cardbuilder https://open.feishu.cn/tool/cardbuilder?from=custom_bot_doc
-func (m *InteractiveMessage) SetCard(card string) *InteractiveMessage {
-	m.Card = card
-	return m
-}

server/internal/library/notify/feishu/internal/security/security.go

@@ -1,21 +0,0 @@
-package security
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/base64"
-	"fmt"
-)
-
-// GenSign generate sign
-func GenSign(secret string, timestamp int64) (string, error) {
-	stringToSign := fmt.Sprintf("%v", timestamp) + "\n" + secret
-	var data []byte
-	h := hmac.New(sha256.New, []byte(stringToSign))
-	_, err := h.Write(data)
-	if err != nil {
-		return "", err
-	}
-	signature := base64.StdEncoding.EncodeToString(h.Sum(nil))
-	return signature, nil
-}

server/internal/library/notify/feishu/message.go

@@ -1,66 +0,0 @@
-package feishu
-
-import (
-	"reflect"
-	"strings"
-)
-
-type MsgType string
-
-// MsgType
-const (
-	MsgTypeText        MsgType = "text"
-	MsgTypePost        MsgType = "post"
-	MsgTypeImage       MsgType = "image"
-	MsgTypeShareChat   MsgType = "share_chat"
-	MsgTypeInteractive MsgType = "interactive"
-)
-
-// Message interface
-type Message interface {
-	Body() map[string]interface{}
-}
-
-func structToMap(item interface{}) map[string]interface{} {
-	res := map[string]interface{}{}
-	if item == nil {
-		return res
-	}
-	v := reflect.TypeOf(item)
-	reflectValue := reflect.ValueOf(item)
-	reflectValue = reflect.Indirect(reflectValue)
-
-	if v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	for i := 0; i < v.NumField(); i++ {
-		tag := v.Field(i).Tag.Get("json")
-
-		// remove omitEmpty
-		omitEmpty := false
-		if strings.HasSuffix(tag, "omitempty") {
-			omitEmpty = true
-			idx := strings.Index(tag, ",")
-			if idx > 0 {
-				tag = tag[:idx]
-			} else {
-				tag = ""
-			}
-		}
-
-		field := reflectValue.Field(i).Interface()
-		if tag != "" && tag != "-" {
-			if omitEmpty && reflectValue.Field(i).IsZero() {
-				continue
-			}
-
-			if v.Field(i).Type.Kind() == reflect.Struct {
-				res[tag] = structToMap(field)
-			} else {
-				res[tag] = field
-			}
-		}
-	}
-	return res
-}

server/internal/library/notify/feishu/post.go

@@ -1,170 +0,0 @@
-package feishu
-
-import (
-	"encoding/json"
-	"log"
-)
-
-type PostMessage struct {
-	MsgType MsgType     `json:"msg_type"`
-	Content PostContent `json:"content"`
-}
-
-func NewPostMessage() *PostMessage {
-	return &PostMessage{}
-}
-
-func (m *PostMessage) Body() map[string]interface{} {
-	m.MsgType = MsgTypePost
-	return structToMap(m)
-}
-
-func (m *PostMessage) SetZH(u PostUnit) *PostMessage {
-	m.Content.Post.ZH = u
-	return m
-}
-
-func (m *PostMessage) SetZHTitle(t string) *PostMessage {
-	m.Content.Post.ZH.Title = t
-	return m
-}
-
-func (m *PostMessage) AppendZHContent(i []PostItem) *PostMessage {
-	m.Content.Post.ZH.Content = append(m.Content.Post.ZH.Content, i)
-	return m
-}
-
-func (m *PostMessage) SetJA(u PostUnit) *PostMessage {
-	m.Content.Post.JA = u
-	return m
-}
-
-func (m *PostMessage) SetJATitle(t string) *PostMessage {
-	m.Content.Post.JA.Title = t
-	return m
-}
-
-func (m *PostMessage) AppendJAContent(i []PostItem) *PostMessage {
-	m.Content.Post.JA.Content = append(m.Content.Post.JA.Content, i)
-	return m
-}
-
-func (m *PostMessage) SetEN(u PostUnit) *PostMessage {
-	m.Content.Post.EN = u
-	return m
-}
-
-func (m *PostMessage) SetENTitle(t string) *PostMessage {
-	m.Content.Post.EN.Title = t
-	return m
-}
-
-func (m *PostMessage) AppendENContent(i []PostItem) *PostMessage {
-	m.Content.Post.EN.Content = append(m.Content.Post.EN.Content, i)
-	return m
-}
-
-type PostContent struct {
-	Post PostBody `json:"post"`
-}
-
-type PostBody struct {
-	ZH PostUnit `json:"zh_cn,omitempty"`
-	JA PostUnit `json:"ja_jp,omitempty"`
-	EN PostUnit `json:"en_us,omitempty"`
-}
-
-type PostUnit struct {
-	Title   string       `json:"title,omitempty"`
-	Content [][]PostItem `json:"content"`
-}
-
-type PostItem interface{}
-
-type Text struct {
-	Tag      string `json:"tag"`
-	Text     string `json:"text"`
-	UnEscape bool   `json:"un_escape,omitempty"`
-}
-
-func NewText(text string) Text {
-	t := Text{
-		Tag:  "text",
-		Text: text,
-	}
-	return t
-}
-
-type A struct {
-	Tag      string `json:"tag"`
-	Text     string `json:"text"`
-	Href     string `json:"href"`
-	UnEscape bool   `json:"un_escape,omitempty"`
-}
-
-func NewA(text, href string) A {
-	t := A{
-		Tag:  "a",
-		Text: text,
-		Href: href,
-	}
-	return t
-}
-
-type AT struct {
-	Tag    string `json:"tag"`
-	UserID string `json:"user_id"`
-}
-
-func NewAT(userID string) AT {
-	t := AT{
-		Tag:    "at",
-		UserID: userID,
-	}
-	return t
-}
-
-type Image struct {
-	Tag      string `json:"tag"`
-	ImageKey string `json:"image_key"`
-	Height   int    `json:"height"`
-	Width    int    `json:"width"`
-}
-
-func NewImage(imageKey string, height, width int) Image {
-	t := Image{
-		Tag:      "image",
-		ImageKey: imageKey,
-		Height:   height,
-		Width:    width,
-	}
-	return t
-}
-
-type PostCMDMessage struct {
-	MsgType MsgType        `json:"msg_type"`
-	Content PostCMDContent `json:"content"`
-}
-
-func (m *PostCMDMessage) Body() map[string]interface{} {
-	m.MsgType = MsgTypePost
-	return structToMap(m)
-}
-
-type PostCMDContent struct {
-	Post map[string]interface{} `json:"post"`
-}
-
-func NewPostCMDMessage() *PostCMDMessage {
-	return &PostCMDMessage{}
-}
-
-func (m *PostCMDMessage) SetPost(post string) *PostCMDMessage {
-	var result map[string]interface{}
-	err := json.Unmarshal([]byte(post), &result)
-	if err != nil {
-		log.Print("SetPost err: ", err)
-	}
-	m.Content.Post = result
-	return m
-}

server/internal/library/notify/feishu/sharechat.go

@@ -1,24 +0,0 @@
-package feishu
-
-type ShareChatMessage struct {
-	MsgType MsgType          `json:"msg_type"`
-	Content ShareChatContent `json:"content"`
-}
-
-type ShareChatContent struct {
-	ShareChatID string `json:"share_chat_id"`
-}
-
-func (m *ShareChatMessage) Body() map[string]interface{} {
-	m.MsgType = MsgTypeShareChat
-	return structToMap(m)
-}
-
-func NewShareChatMessage() *ShareChatMessage {
-	return &ShareChatMessage{}
-}
-
-func (m *ShareChatMessage) SetShareChatID(id string) *ShareChatMessage {
-	m.Content.ShareChatID = id
-	return m
-}

server/internal/library/notify/feishu/text.go

@@ -1,24 +0,0 @@
-package feishu
-
-type TextMessage struct {
-	MsgType MsgType `json:"msg_type"`
-	Content Content `json:"content"`
-}
-
-type Content struct {
-	Text string `json:"text"`
-}
-
-func (m *TextMessage) Body() map[string]interface{} {
-	m.MsgType = MsgTypeText
-	return structToMap(m)
-}
-
-func NewTextMessage() *TextMessage {
-	return &TextMessage{}
-}
-
-func (m *TextMessage) SetText(text string) *TextMessage {
-	m.Content.Text = text
-	return m
-}

server/internal/library/payment/alipay/handle.go

@@ -1,3 +1,8 @@
+// Package alipay
+// @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 alipay
 
 import (

server/internal/library/payment/alipay/model.go

@@ -1,3 +1,8 @@
+// Package alipay
+// @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 alipay
 
 import "github.com/gogf/gf/v2/os/gtime"

server/internal/library/payment/config.go

@@ -1,3 +1,8 @@
+// Package payment
+// @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 payment
 
 import "hotgo/internal/model"

server/internal/library/payment/notifycall.go

@@ -1,3 +1,8 @@
+// Package payment
+// @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 payment
 
 import (

server/internal/library/payment/payment.go

@@ -1,3 +1,8 @@
+// Package payment
+// @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 payment
 
 import (

server/internal/library/payment/qqpay/handle.go

@@ -1,3 +1,8 @@
+// Package qqpay
+// @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 qqpay
 
 import (

server/internal/library/payment/qqpay/model.go

@@ -1,3 +1,8 @@
+// Package qqpay
+// @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 qqpay
 
 // NotifyRequest QQ支付异步通知参数

server/internal/library/payment/wxpay/handle.go

@@ -1,3 +1,8 @@
+// Package wxpay
+// @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 wxpay
 
 import (

server/internal/library/payment/wxpay/model.go

@@ -1 +1,6 @@
+// Package wxpay
+// @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 wxpay

server/internal/library/queue/consumer.go

@@ -1,3 +1,8 @@
+// Package queue
+// @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 queue
 
 import (

server/internal/library/queue/disk.go

@@ -1,3 +1,8 @@
+// Package queue
+// @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 queue
 
 import (

server/internal/library/queue/disk/disk.go

@@ -1,3 +1,8 @@
+// Package disk
+// @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 disk
 
 import (

server/internal/library/queue/disk/reader.go

@@ -1,3 +1,8 @@
+// Package disk
+// @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 disk
 
 import (

server/internal/library/queue/disk/writer.go

@@ -1,3 +1,8 @@
+// Package disk
+// @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 disk
 
 import (

server/internal/library/queue/producer.go

@@ -1,3 +1,8 @@
+// Package queue
+// @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 queue
 
 import (

server/internal/library/queue/redismq.go

@@ -1,3 +1,8 @@
+// Package queue
+// @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 queue
 
 import (

server/internal/library/sms/config.go

@@ -1,3 +1,8 @@
+// Package sms
+// @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 sms
 
 import (

server/internal/library/sms/sms.go

@@ -1,3 +1,8 @@
+// Package sms
+// @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 sms
 
 import (

server/internal/library/sms/sms_aliyun.go

@@ -1,3 +1,8 @@
+// Package sms
+// @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 sms
 
 import (

server/internal/library/sms/sms_tencent.go

@@ -1,3 +1,8 @@
+// Package sms
+// @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 sms
 
 import (

server/internal/library/storager/config.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 import (

server/internal/library/storager/model.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 // FileMeta 文件元数据

server/internal/library/storager/upload.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 import (

server/internal/library/storager/upload_cos.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 import (

server/internal/library/storager/upload_local.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 import (

server/internal/library/storager/upload_oss.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 import (

server/internal/library/storager/upload_qiniu.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 import (

server/internal/library/storager/upload_ucloud.go

@@ -1,3 +1,8 @@
+// Package storager
+// @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 storager
 
 import (

server/internal/library/token/token.go

@@ -1,3 +1,8 @@
+// Package token
+// @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 token
 
 import (

server/internal/library/wechat/cache.go

@@ -1,3 +1,8 @@
+// Package wechat
+// @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 wechat
 
 import (

server/internal/library/wechat/config.go

@@ -1,3 +1,8 @@
+// Package wechat
+// @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 wechat
 
 import "hotgo/internal/model"

server/internal/library/wechat/wechat.go

@@ -1,3 +1,8 @@
+// Package wechat
+// @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 wechat
 
 import (

server/internal/logic/admin/member.go

@@ -521,7 +521,7 @@ func (s *sAdminMember) Edit(ctx context.Context, in *adminin.MemberEditInp) (err
 			}
 
 			// 更新岗位
-			if err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds); err != nil {
+			if err = service.AdminMemberPost().UpdatePostIds(ctx, in.Id, in.PostIds); err != nil {
 				err = gerror.Wrap(err, "更新用户岗位失败，请稍后重试！")
 			}
 
@@ -557,7 +557,7 @@ func (s *sAdminMember) Edit(ctx context.Context, in *adminin.MemberEditInp) (err
 		}
 
 		// 更新岗位
-		if err = dao.AdminMemberPost.UpdatePostIds(ctx, id, in.PostIds); err != nil {
+		if err = service.AdminMemberPost().UpdatePostIds(ctx, id, in.PostIds); err != nil {
 			err = gerror.Wrap(err, "新增用户岗位失败，请稍后重试！")
 		}
 

server/internal/logic/admin/site.go

@@ -132,7 +132,7 @@ func (s *sAdminSite) Register(ctx context.Context, in *adminin.RegisterInp) (err
 		}
 
 		// 更新岗位
-		if err = dao.AdminMemberPost.UpdatePostIds(ctx, id, config.PostIds); err != nil {
+		if err = service.AdminMemberPost().UpdatePostIds(ctx, id, config.PostIds); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
 		}
 		return

server/internal/logic/sys/cron.go

@@ -183,11 +183,22 @@ func (s *sSysCron) List(ctx context.Context, in *sysin.CronListInp) (list []*sys
 	}
 
 	for _, v := range list {
-		v.GroupName, _ = dao.SysCronGroup.GetName(ctx, v.GroupId)
+		v.GroupName, _ = s.GetName(ctx, v.GroupId)
 	}
 	return
 }
 
+// GetName 获取分组名称
+func (s *sSysCron) GetName(ctx context.Context, id int64) (name string, err error) {
+	m := dao.SysCronGroup.Ctx(ctx).Fields("name").Where("id", id)
+	list, err := m.Value()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return name, err
+	}
+	return list.String(), nil
+}
+
 // OnlineExec 在线执行
 func (s *sSysCron) OnlineExec(ctx context.Context, in *sysin.OnlineExecInp) (err error) {
 	var data *entity.SysCron

server/internal/logic/sys/dict_data.go

@@ -8,6 +8,7 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/model/input/sysin"
@@ -47,7 +48,7 @@ func (s *sSysDictData) Edit(ctx context.Context, in *sysin.DictDataEditInp) (err
 	}
 
 	// 新增
-	in.Type, err = dao.SysDictType.GetType(ctx, in.TypeID)
+	in.Type, err = s.GetType(ctx, in.TypeID)
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -70,7 +71,7 @@ func (s *sSysDictData) List(ctx context.Context, in *sysin.DictDataListInp) (lis
 	mod := dao.SysDictData.Ctx(ctx)
 	// 类型ID
 	if in.TypeID > 0 {
-		types, err := dao.SysDictType.GetTypes(ctx, in.TypeID)
+		types, err := s.GetTypes(ctx, in.TypeID)
 		if err != nil {
 			return list, totalCount, err
 		}
@@ -107,11 +108,42 @@ func (s *sSysDictData) List(ctx context.Context, in *sysin.DictDataListInp) (lis
 	}
 
 	for _, v := range list {
-		v.TypeID, _ = dao.SysDictType.GetId(ctx, v.Type)
+		v.TypeID, _ = s.GetId(ctx, v.Type)
 	}
 	return list, totalCount, err
 }
 
+// GetId 获取指定类型的ID
+func (s *sSysDictData) GetId(ctx context.Context, t string) (id int64, err error) {
+	m := dao.SysDictType.Ctx(ctx).Fields("id").Where("type", t).Where("status", consts.StatusEnabled)
+	val, err := m.Value()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return 0, err
+	}
+	return val.Int64(), nil
+}
+
+// GetType 获取指定ID的类型标识
+func (s *sSysDictData) GetType(ctx context.Context, id int64) (types string, err error) {
+	m := dao.SysDictType.Ctx(ctx).Fields("type").Where("id", id).Where("status", consts.StatusEnabled)
+	val, err := m.Value()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return types, err
+	}
+	return val.String(), nil
+}
+
+// GetTypes 获取指定ID的所有类型标识，包含下级
+func (s *sSysDictData) GetTypes(ctx context.Context, id int64) (types []string, err error) {
+	columns, err := dao.SysDictType.Ctx(ctx).Fields("type").
+		Where("id", id).WhereOr("pid", id).Where("status", consts.StatusEnabled).
+		Array()
+	types = g.NewVar(columns).Strings()
+	return
+}
+
 // Select 获取列表
 func (s *sSysDictData) Select(ctx context.Context, in *sysin.DataSelectInp) (list sysin.DataSelectModel, err error) {
 	mod := dao.SysDictData.Ctx(ctx).Where("type", in.Type)

server/internal/logic/sys/ems_log.go

@@ -335,7 +335,7 @@ func (s *sSysEmsLog) AllowSend(ctx context.Context, models *entity.SysEmsLog, co
 	}
 
 	if config.MaxIpLimit > 0 {
-		count, err := dao.SysEmsLog.NowDayCount(ctx, models.Event, models.Email)
+		count, err := s.NowDayCount(ctx, models.Event, models.Email)
 		if err != nil {
 			return err
 		}
@@ -348,6 +348,15 @@ func (s *sSysEmsLog) AllowSend(ctx context.Context, models *entity.SysEmsLog, co
 	return
 }
 
+// NowDayCount 当天发送次数
+func (s *sSysEmsLog) NowDayCount(ctx context.Context, event, email string) (count int, err error) {
+	return dao.SysEmsLog.Ctx(ctx).
+		Where("email", email).
+		Where("event", event).
+		WhereGTE("created_at", gtime.Now().Format("Y-m-d")).
+		Count()
+}
+
 // VerifyCode 效验验证码
 func (s *sSysEmsLog) VerifyCode(ctx context.Context, in *sysin.VerifyEmsCodeInp) (err error) {
 	if in.Event == "" {

server/internal/logic/sys/sms_log.go

@@ -245,7 +245,7 @@ func (s *sSysSmsLog) AllowSend(ctx context.Context, models *entity.SysSmsLog, co
 	}
 
 	if config.SmsMaxIpLimit > 0 {
-		count, err := dao.SysSmsLog.NowDayCount(ctx, models.Event, models.Mobile)
+		count, err := s.NowDayCount(ctx, models.Event, models.Mobile)
 		if err != nil {
 			return err
 		}
@@ -258,6 +258,15 @@ func (s *sSysSmsLog) AllowSend(ctx context.Context, models *entity.SysSmsLog, co
 	return
 }
 
+// NowDayCount 当天发送次数
+func (s *sSysSmsLog) NowDayCount(ctx context.Context, event, mobile string) (count int, err error) {
+	return dao.SysSmsLog.Ctx(ctx).
+		Where("mobile", mobile).
+		Where("event", event).
+		WhereGTE("created_at", gtime.Now().Format("Y-m-d")).
+		Count()
+}
+
 // VerifyCode 效验验证码
 func (s *sSysSmsLog) VerifyCode(ctx context.Context, in *sysin.VerifyCodeInp) (err error) {
 	if in.Event == "" {

server/internal/model/config.go

@@ -1,3 +1,8 @@
+// Package model
+// @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 model
 
 // 后台配置.

server/internal/model/config_load.go

@@ -1,3 +1,8 @@
+// Package model
+// @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 model
 
 // 本地配置.

server/internal/model/gen_codes.go

@@ -1,3 +1,8 @@
+// Package model
+// @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 model
 
 // GenCodesColumn 生成表字段属性

server/internal/model/input/form/page.go

@@ -1,3 +1,8 @@
+// Package form
+// @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 form
 
 import (

server/internal/model/input/form/select.go

@@ -1,3 +1,8 @@
+// Package form
+// @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 form
 
 import "github.com/gogf/gf/v2/util/gconv"

server/internal/model/input/payin/general.go

@@ -1,3 +1,8 @@
+// Package payin
+// @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 payin
 
 import (

server/internal/model/input/servmsgin/auth.go

@@ -1,3 +1,8 @@
+// Package servmsgin
+// @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 servmsgin
 
 import "github.com/gogf/gf/v2/os/gtime"

server/internal/model/input/servmsgin/example.go

@@ -1,3 +1,8 @@
+// Package servmsgin
+// @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 servmsgin
 
 import "github.com/gogf/gf/v2/os/gtime"

server/utility/convert/match.go

@@ -1,3 +1,8 @@
+// Package convert
+// @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 convert
 
 import (

server/utility/simple/event.go

@@ -1,3 +1,8 @@
+// Package simple
+// @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 simple
 
 import (

server/utility/url/url.go

@@ -1,3 +1,8 @@
+// Package url
+// @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 url
 
 import (

web/src/views/apply/notice/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="n-layout-page-header">
       <n-card :bordered="false" title="通知公告">
-        在这里你可以发送通知、公告、私信到平台中的用户
+        在这里，您可以向平台中的用户发送通知、公告和私信消息
       </n-card>
     </div>
     <n-card :bordered="false" class="proCard">

web/src/views/home/message/message.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="n-layout-page-header">
       <n-card :bordered="false" title="我的消息">
-        在这里你可以查看平台中通知、公告和与你相关的私信
+        在这里，您可以方便地查看平台中的通知、公告和与您相关的私信消息
       </n-card>
     </div>
     <n-card :bordered="false" class="proCard">
@@ -13,9 +13,9 @@
         animated
         @before-leave="handleBeforeLeave"
       >
-        <n-tab-pane name="1" tab="系统通知"> <List :type="defaultTab" /></n-tab-pane>
+        <n-tab-pane name="1" tab="通知"> <List :type="defaultTab" /></n-tab-pane>
-        <n-tab-pane name="2" tab="系统公告"> <List :type="defaultTab" /> </n-tab-pane>
+        <n-tab-pane name="2" tab="公告"> <List :type="defaultTab" /> </n-tab-pane>
-        <n-tab-pane name="3" tab="私信消息"> <List :type="defaultTab" /> </n-tab-pane>
+        <n-tab-pane name="3" tab="私信"> <List :type="defaultTab" /> </n-tab-pane>
       </n-tabs>
     </n-card>
   </div>

web/src/views/monitor/netconn/index.vue

@@ -56,7 +56,7 @@
   import GroupModal from './modal/modal.vue';
   import Edit from '@/views/monitor/netconn/modal/edit.vue';
   import { newState, options, State } from '@/views/monitor/netconn/modal/model';
-  import { defRangeShortcuts } from "@/utils/dateUtil";
+  import { defRangeShortcuts } from '@/utils/dateUtil';
 
   const message = useMessage();
   const dialog = useDialog();

web/src/views/monitor/serve-monitor/index.vue

@@ -93,7 +93,7 @@
   import DataItem from './components/DataItem.vue';
   import LoadChart from './components/chart/LoadChart.vue';
   import FullYearSalesChart from './components/chart/FullYearSalesChart.vue';
-  import { defineComponent, inject, onMounted, ref, onUpdated } from 'vue';
+  import { defineComponent, inject, onMounted, ref, onUnmounted } from 'vue';
   import { SocketEnum } from '@/enums/socketEnum';
   import { addOnMessage, sendMsg } from '@/utils/websocket';
   import { formatBefore } from '@/utils/dateUtil';
@@ -107,6 +107,7 @@
       FullYearSalesChart,
     },
     setup() {
+      const timer = ref(0);
       const dataRunInfo = ref({
         arch: '',
         goMem: '0MB',
@@ -180,7 +181,7 @@
       const fullYearSalesChartRef = ref<InstanceType<typeof FullYearSalesChart>>();
       const onMessageList = inject('onMessageList');
 
-      const onAdminMonitor = (res) => {
+      const onAdminMonitor = (res: { data: string }) => {
         const data = JSON.parse(res.data);
         if (data.event === SocketEnum.EventAdminMonitorRunInfo) {
           loading.value = false;
@@ -207,7 +208,14 @@
       addOnMessage(onMessageList, onAdminMonitor);
 
       onMounted(() => {
-        getInfo();
+        loading.value = true;
+        sendMsg(SocketEnum.EventAdminMonitorTrends);
+        sendMsg(SocketEnum.EventAdminMonitorRunInfo);
+
+        timer.value = window.setInterval(function () {
+          sendMsg(SocketEnum.EventAdminMonitorTrends);
+          sendMsg(SocketEnum.EventAdminMonitorRunInfo);
+        }, 2000);
 
         setTimeout(() => {
           if (loading.value) {
@@ -221,28 +229,10 @@
         }, 5000);
       });
 
-      onUpdated(() => {
+      onUnmounted(() => {
-        // 切换页面后直接出发一次
+        window.clearInterval(timer.value);
-        if (loading.value === false) {
-          sendMsg(SocketEnum.EventAdminMonitorTrends);
-          sendMsg(SocketEnum.EventAdminMonitorRunInfo);
-        }
       });
 
-      function getInfo() {
-        loading.value = true;
-        sendMsg(SocketEnum.EventAdminMonitorTrends);
-        sendMsg(SocketEnum.EventAdminMonitorRunInfo);
-
-        setInterval(function () {
-          sendMsg(SocketEnum.EventAdminMonitorTrends);
-        }, 1000 * 2);
-
-        setInterval(function () {
-          sendMsg(SocketEnum.EventAdminMonitorRunInfo);
-        }, 1000 * 10);
-      }
-
       return {
         loading,
         collapse,

web/src/views/org/dept/dept.vue

@@ -25,6 +25,7 @@
         </n-space>
 
         <n-data-table
+          v-if="data.length > 0 || !loading"
           :columns="columns"
           :data="data"
           :row-key="rowKey"
@@ -317,6 +318,10 @@
         return h(TableAction as any, {
           style: 'button',
           actions: [
+            {
+              label: '添加',
+              onClick: handleAddSub.bind(null, record),
+            },
             {
               label: '编辑',
               onClick: handleEdit.bind(null, record),
@@ -341,6 +346,12 @@
     optionsDefaultValue.value = 0;
   }
 
+  function handleAddSub(record: Recordable) {
+    showModal.value = true;
+    formParams.value = cloneDeep(defaultState);
+    optionsDefaultValue.value = record.id;
+  }
+
   function handleEdit(record: Recordable) {
     showModal.value = true;
     formParams.value = cloneDeep(record);

web/src/views/permission/role/role.vue

@@ -1,20 +1,8 @@
 <template>
   <div>
-    <div class="n-layout-page-header">
+    <n-card :bordered="false"  title="角色管理">
-      <n-card :bordered="false" title="角色管理"> 在这里可以管理你权限下的角色权限</n-card>
+      <n-space vertical :size="12">
-    </div>
+        <n-space>
-    <n-card :bordered="false" class="mt-4 proCard">
-      <BasicTable
-        :columns="columns"
-        :request="loadDataTable"
-        :row-key="(row) => row.id"
-        ref="actionRef"
-        :actionColumn="actionColumn"
-        @update:checked-row-keys="onCheckedRow"
-        :pagination="false"
-        :resizeHeightOffset="-20000"
-      >
-        <template #tableTitle>
           <n-button type="primary" @click="addTable">
             <template #icon>
               <n-icon>
@@ -23,8 +11,18 @@
             </template>
             添加角色
           </n-button>
-        </template>
+        </n-space>
-      </BasicTable>
+
+        <n-data-table
+          v-if="data.length > 0 || !loading"
+          :columns="columns.concat(actionColumn)"
+          :data="data"
+          :row-key="(row) => row.id"
+          :loading="loading"
+          :resizeHeightOffset="-20000"
+          default-expand-all
+        />
+      </n-space>
     </n-card>
 
     <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" :title="editRoleTitle">
@@ -155,8 +153,8 @@
 
 <script lang="ts" setup>
   import { h, onMounted, reactive, ref } from 'vue';
-  import { useDialog, useMessage } from 'naive-ui';
+  import { NButton, useDialog, useMessage } from 'naive-ui';
-  import { BasicColumn, BasicTable, TableAction } from '@/components/Table';
+  import { BasicColumn, TableAction } from '@/components/Table';
   import {
     Delete,
     Edit,
@@ -195,6 +193,8 @@
   const dataFormBtnLoading = ref(false);
   const showDataModal = ref(false);
   const dataForm = ref<any>();
+  const loading = ref(false);
+  const data = ref<any>([]);
 
   const rules = {
     name: {
@@ -270,12 +270,18 @@
   });
 
   const loadDataTable = async (res: any) => {
-    return await getRoleList({ ...res, ...{ pageSize: 100, page: 1 } });
+    loading.value = true;
+    const tmp = await getRoleList({ ...res, ...{ pageSize: 100, page: 1 } });
+    data.value = tmp?.list;
+    if (data.value === undefined || data.value === null) {
+      data.value = [];
+    }
+    loading.value = false;
   };
 
-  function onCheckedRow(rowKeys: any[]) {
+  onMounted(async () => {
-    console.log(rowKeys);
+    await loadDataTable({});
-  }
+  });
 
   function reloadTable() {
     actionRef.value.reload();