更新2.1.2版本，优化部门、角色权限，增加上下级关系；增加登录、系统、短信日志;优化省市区编码

server/internal/logic/sys/blacklist.go

@@ -9,9 +9,13 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
+	"hotgo/internal/global"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
 	"hotgo/utility/validate"
@@ -28,8 +32,9 @@ func init() {
 }
 
 // Delete 删除
-func (s *sSysBlacklist) Delete(ctx context.Context, in sysin.BlacklistDeleteInp) error {
-	_, err := dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Delete()
+func (s *sSysBlacklist) Delete(ctx context.Context, in sysin.BlacklistDeleteInp) (err error) {
+	defer s.VariableLoad(ctx, err)
+	_, err = dao.SysBlacklist.Ctx(ctx).Where("id", in.Id).Delete()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -40,6 +45,7 @@ func (s *sSysBlacklist) Delete(ctx context.Context, in sysin.BlacklistDeleteInp)
 
 // Edit 修改/新增
 func (s *sSysBlacklist) Edit(ctx context.Context, in sysin.BlacklistEditInp) (err error) {
+	defer s.VariableLoad(ctx, err)
 	if in.Ip == "" {
 		err = gerror.New("ip不能为空")
 		return err
@@ -69,6 +75,7 @@ func (s *sSysBlacklist) Edit(ctx context.Context, in sysin.BlacklistEditInp) (er
 
 // Status 更新部门状态
 func (s *sSysBlacklist) Status(ctx context.Context, in sysin.BlacklistStatusInp) (err error) {
+	defer s.VariableLoad(ctx, err)
 	if in.Id <= 0 {
 		err = gerror.New("ID不能为空")
 		return err
@@ -148,3 +155,112 @@ func (s *sSysBlacklist) List(ctx context.Context, in sysin.BlacklistListInp) (li
 
 	return list, totalCount, err
 }
+
+// VariableLoad 变化加载
+func (s *sSysBlacklist) VariableLoad(ctx context.Context, err error) {
+	if err == nil {
+		s.Load(ctx)
+	}
+}
+
+// Load 加载黑名单
+func (s *sSysBlacklist) Load(ctx context.Context) {
+	global.Blacklists = make(map[string]struct{})
+
+	array, err := dao.SysBlacklist.Ctx(ctx).
+		Fields(dao.SysBlacklist.Columns().Ip).
+		Where(dao.SysBlacklist.Columns().Status, consts.StatusEnabled).
+		Array()
+	if err != nil {
+		g.Log().Fatal(ctx, "load blacklist fail：%+v", err)
+		return
+	}
+
+	matchStrategy := func(originIp string) {
+		// 多个IP
+		if gstr.Contains(originIp, ",") {
+			ips := gstr.Explode(",", originIp)
+			if len(ips) > 0 {
+				for _, ip := range ips {
+					if !validate.IsIp(ip) {
+						continue
+					}
+					global.Blacklists[ip] = struct{}{}
+				}
+			}
+
+			return
+		}
+
+		// IP段
+		if gstr.Contains(originIp, "/24") {
+			segment := gstr.Replace(originIp, "/24", "")
+			if !validate.IsIp(segment) {
+				return
+			}
+
+			var (
+				start  = gstr.Explode(".", segment)
+				prefix = gstr.Implode(".", start[:len(start)-1]) + "."
+				index  = gconv.Int(start[len(start)-1])
+			)
+
+			if index < 1 {
+				index = 1
+			}
+
+			for i := index; i <= 254; i++ {
+				global.Blacklists[prefix+gconv.String(i)] = struct{}{}
+			}
+
+			return
+		}
+
+		// IP范围
+		if gstr.Contains(originIp, "-") {
+			originIps := gstr.Explode("-", originIp)
+			if len(originIps) != 2 {
+				return
+			}
+
+			if !validate.IsIp(originIps[0]) || !validate.IsIp(originIps[1]) {
+				return
+			}
+
+			var (
+				start      = gstr.Explode(".", originIps[0])
+				prefix     = gstr.Implode(".", start[:len(start)-1]) + "."
+				startIndex = gconv.Int(gstr.SubStrFromREx(originIps[0], "."))
+				endIndex   = gconv.Int(gstr.SubStrFromREx(originIps[1], "."))
+			)
+
+			if startIndex >= endIndex {
+				global.Blacklists[originIps[0]] = struct{}{}
+				return
+			}
+
+			if startIndex < 1 {
+				startIndex = 1
+			}
+
+			if endIndex > 254 {
+				endIndex = 254
+			}
+
+			for i := startIndex; i <= endIndex; i++ {
+				global.Blacklists[prefix+gconv.String(i)] = struct{}{}
+			}
+			return
+		}
+
+		// 指定IP
+		if validate.IsIp(originIp) {
+			global.Blacklists[originIp] = struct{}{}
+			return
+		}
+	}
+
+	for _, v := range array {
+		matchStrategy(v.String())
+	}
+}