Merge branch 'main' of https://git.apinb.com/bsm-sdk/core

README.md

@@ -5,3 +5,23 @@ go env -w  GONOPROXY=git.apinb.com/*
 go env -w  GOINSECURE=git.apinb.com/*
 go env -w  GONOSUMDB=git.apinb.com/*
 ```
+# crypto 加密与解密
+## GCM加密
+```
+AESGCMEncrypt GCM 加密
+AESGCMDecrypt GCM 解密
+```
+## CBC加密
+```
+Encrypt CBC加密
+Decrypt CBC解密
+```
+## ECB加密
+```
+AesEncryptECB ECB加密
+AesDecryptECB ECB解密
+```
+## 环境变量检测
+```
+AesKeyCheck 秘钥环境变量检测
+```

conf/types.go

@@ -1,12 +1,13 @@
 package conf
 
 type Base struct {
-	Service   string `yaml:"Service"`   // 服务名称
+	Service        string `yaml:"Service"`   // 服务名称
-	Port      string `yaml:"Port"`      // 服务监听端口,0为自动随机端口
+	Port           string `yaml:"Port"`      // 服务监听端口,0为自动随机端口
-	Cache     string `yaml:"Cache"`     // REDIS缓存
+	Cache          string `yaml:"Cache"`     // REDIS缓存
-	SecretKey string `yaml:"SecretKey"` // 服务秘钥
+	SecretKey      string `yaml:"SecretKey"` // 服务秘钥
-	BindIP    string `yaml:"BindIP"`    // 绑定IP
+	BindIP         string `yaml:"BindIP"`    // 绑定IP
-	Addr      string `yaml:"Addr"`
+	Addr           string `yaml:"Addr"`
+	OnMicroService bool   `yaml:"OnMicroService"`
 }
 
 type DBConf struct {
@@ -48,11 +49,14 @@ type RpcConf struct {
 }
 
 type OssConf struct {
+	Platform        string `yaml:"Platform"`        // oss平台：aliyun,tencent,huawei,aws,minio
 	Site            string `yaml:"Site"`            // oss站点HOST
 	Endpoint        string `yaml:"Endpoint"`        // oss服务接入地址
 	Region          string `yaml:"Region"`          // oss服务区域
 	AccessKeyID     string `yaml:"AccessKeyId"`     // oss AccessKeyId
 	AccessKeySecret string `yaml:"AccessKeySecret"` // oss AccessKeySecret
+	UseSSL          bool   `yaml:"UseSSL"`          // 是否使用SSL
+
 }
 
 type MqConf struct {

crypto/aes/aes.go

@@ -4,10 +4,58 @@ import (
 	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
+	"crypto/rand"
 	"encoding/base64"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"io"
+	"os"
 )
 
-// AES加密
+// =================== GCM ======================
+// AEC GCM 加密
+func AESGCMEncrypt(plaintext, key []byte) (string, error) {
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return "", err
+	}
+	gcm, err := cipher.NewGCM(block)
+	if err != nil {
+		return "", err
+	}
+	nonce := make([]byte, gcm.NonceSize())
+	if _, err = io.ReadFull(rand.Reader, nonce); err != nil {
+		return "", err
+	}
+	ciphertext := gcm.Seal(nonce, nonce, plaintext, nil)
+	return hex.EncodeToString(ciphertext), nil
+}
+
+// AEC GCM 解密
+func AESGCMDecrypt(ciphertext string, key []byte) ([]byte, error) {
+	data, err := hex.DecodeString(ciphertext)
+	if err != nil {
+		return nil, err
+	}
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	gcm, err := cipher.NewGCM(block)
+	if err != nil {
+		return nil, err
+	}
+	nonceSize := gcm.NonceSize()
+	if len(data) < nonceSize {
+		return nil, errors.New("密文无效")
+	}
+	nonce, cipherbyte := data[:nonceSize], data[nonceSize:]
+	return gcm.Open(nil, nonce, cipherbyte, nil)
+}
+
+// =================== CBC ======================
+// AES CBC加密
 func Encrypt(key string, iv string, data string) string {
 	if len(data) == 0 {
 		return ""
@@ -24,7 +72,7 @@ func Encrypt(key string, iv string, data string) string {
 	return data
 }
 
-// AES解密
+// AES CBC解密
 func Decrypt(key string, iv string, data string) string {
 	if len(data) == 0 {
 		return ""
@@ -102,3 +150,24 @@ func generateKey(key []byte) (genKey []byte) {
 	}
 	return genKey
 }
+
+func AesKeyCheck(key string) (string, error) {
+	// 从环境变量获取密钥
+	keyHex := os.Getenv(key)
+	if keyHex == "" {
+		fmt.Println("环境变量 RST_KEY 未设置")
+		return "", errors.New("环境变量 RST_KEY 未设置")
+	}
+	// 解码十六进制字符串的密钥
+	byteKey, err := hex.DecodeString(keyHex)
+	if err != nil {
+		fmt.Printf("密钥解码失败: %v\n", err)
+		return "", errors.New("密钥解码失败")
+	}
+	// 检查密钥长度
+	if len(byteKey) != 16 && len(key) != 24 && len(key) != 32 {
+		fmt.Printf("无效的密钥长度: %d 字节 (需要16,24或32字节)\n", len(key))
+		return "", errors.New("无效的密钥长度,需要16,24或32字节")
+	}
+	return keyHex, nil
+}

data/map_float.go

@@ -0,0 +1,58 @@
+package data
+
+import (
+	"sync"
+)
+
+var (
+	// Cache
+	CacheMapFloat *MapFloat
+)
+
+// lock
+type MapFloat struct {
+	sync.RWMutex
+	Data map[string]float64
+}
+
+func NewMapFloat() *MapFloat {
+	return &MapFloat{
+		Data: make(map[string]float64),
+	}
+}
+
+func (c *MapFloat) All() map[string]float64 {
+	c.RLock()
+	defer c.RUnlock()
+
+	return c.Data
+}
+
+func (c *MapFloat) Get(key string) float64 {
+	c.RLock()
+	defer c.RUnlock()
+
+	vals, ok := c.Data[key]
+	if !ok {
+		return 0
+	}
+
+	return vals
+}
+
+func (c *MapFloat) Set(key string, val float64) {
+	c.Lock()
+	defer c.Unlock()
+	c.Data[key] = val
+}
+
+func (c *MapFloat) Keys() (keys []string) {
+	c.RLock()
+	defer c.RUnlock()
+
+	for k, _ := range c.Data {
+		keys = append(keys, k)
+	}
+
+	return
+}

data/map_string.go

@@ -0,0 +1,51 @@
+package data
+
+import (
+	"sync"
+)
+
+var (
+	// Cache
+	CacheMapString *MapString
+)
+
+// lock
+type MapString struct {
+	sync.RWMutex
+	Data map[string]string
+}
+
+func NewMapString() *MapString {
+	return &MapString{
+		Data: make(map[string]string),
+	}
+}
+
+func (c *MapString) Get(key string) string {
+	c.RLock()
+	defer c.RUnlock()
+
+	vals, ok := c.Data[key]
+	if !ok {
+		return ""
+	}
+
+	return vals
+}
+
+func (c *MapString) Set(key, val string) {
+	c.Lock()
+	defer c.Unlock()
+	c.Data[key] = val
+}
+
+func (c *MapString) Keys() (keys []string) {
+	c.RLock()
+	defer c.RUnlock()
+
+	for k, _ := range c.Data {
+		keys = append(keys, k)
+	}
+
+	return
+}

errcode/errcode.go

@@ -15,13 +15,18 @@ var (
 
 // standard error code ,start:110
 var (
-	ErrEmpty         = NewError(110, "Data Is Empty")
+	ErrEmpty           = NewError(110, "Data Is Empty")
-	ErrRequestParse  = NewError(111, "Request Parse Fail")
+	ErrRequestParse    = NewError(111, "Request Parse Fail")
-	ErrRequestMust   = NewError(112, "Request Params Required")
+	ErrRequestMust     = NewError(112, "Request Params Required")
-	ErrPermission    = NewError(113, "Permission Denied")
+	ErrPermission      = NewError(113, "Permission Denied")
-	ErrJsonUnmarshal = NewError(114, "Json Unmarshal Fail")
+	ErrJsonUnmarshal   = NewError(114, "Json Unmarshal Fail")
-	ErrJsonMarshal   = NewError(115, "Json Marshal Fail")
+	ErrJsonMarshal     = NewError(115, "Json Marshal Fail")
-	ErrInternal      = NewError(116, "Internal Server Error")
+	ErrInternal        = NewError(116, "Internal Server Error")
+	ErrPassword        = NewError(117, "Password Incorrect")
+	ErrAccountNotFound = NewError(118, "Account Not Found")
+	ErrAccountDisabled = NewError(119, "Account Disabled")
+	ErrDisabled        = NewError(120, "Status Disabled")
+	ErrRecordNotFound  = NewError(121, "Record Not Found")
 )
 
 // jwt error code ,start:130

infra/response.go

@@ -8,29 +8,29 @@ import (
 var Response Reply
 
 type Reply struct {
-	Code int    `json:"code"`
+	Code    int32  `json:"code"`
-	Msg  string `json:"msg"`
+	Message string `json:"message"`
-	Data any    `json:"data"`
+	Result  any    `json:"result"`
 }
 
 func (reply *Reply) Success(ctx *gin.Context, data any) {
-	reply.Code = 200
+	reply.Code = 0
-	reply.Data = data
+	reply.Result = data
-	reply.Msg = ""
+	reply.Message = ""
 	if data == nil {
-		reply.Data = ""
+		reply.Result = ""
 	}
 	ctx.JSON(200, reply)
 }
 func (reply *Reply) Error(ctx *gin.Context, err error) {
 	reply.Code = 500
-	reply.Data = ""
+	reply.Result = ""
 	// Status code defaults to 500
 	e, ok := status.FromError(err)
 	if ok {
-		reply.Code = int(e.Code())
+		reply.Code = int32(e.Code())
 	}
-	reply.Msg = e.Message()
+	reply.Message = e.Message()
 
 	// Send error
 	ctx.JSON(200, reply)

licence/licence.go

@@ -58,8 +58,8 @@ var (
 
 // --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 const (
-	signKey     = "8E853B589944FF7A56BEF02AAA51D6F4"
+	signKey     = "1F36659EC27CFFF849E068EA80B1A4CA"
-	LICENCE_KEY = "TRAIN_LICENCE_KEY"
+	LICENCE_KEY = "BLOCKS_KEY"
 )
 
 // --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -69,13 +69,13 @@ func init() {
 }
 
 func WatchCheckLicence(licPath, licName string) {
-	for {
+	utils.SetInterval(func() {
 		if CheckLicence(licPath, licName) == false {
 			log.Println("授权文件失效，请重新部署授权文件:", licPath)
 			os.Exit(99)
 		}
-		time.Sleep(time.Hour * 1)
+
-	}
+	}, time.Hour*1)
 }
 
 // --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

middleware/jwt.go

@@ -2,7 +2,6 @@ package middleware
 
 import (
 	"encoding/json"
-	"fmt"
 	"log"
 	"net/http"
 
@@ -33,14 +32,14 @@ func JwtAuth(redis *redis.RedisClient) gin.HandlerFunc {
 		}
 
 		// 从redis 获取token,判断当前redis 是否为空
-		tokenKey := fmt.Sprintf("%d-%s-%s", claims.ID, claims.Role, "token")
+		// tokenKey := fmt.Sprintf("%d-%s-%s", claims.ID, claims.Role, "token")
-		redisToken := redis.Client.Get(redis.Ctx, tokenKey)
+		// redisToken := redis.Client.Get(redis.Ctx, tokenKey)
-		if redisToken.Val() == "" {
+		// if redisToken.Val() == "" {
-			log.Println("redis异常", "Token status unauthorized")
+		// 	log.Println("redis异常", "Token status unauthorized")
-			c.JSON(http.StatusUnauthorized, gin.H{"error": "Token status unauthorized"})
+		// 	c.JSON(http.StatusUnauthorized, gin.H{"error": "Token status unauthorized"})
-			c.Abort()
+		// 	c.Abort()
-			return
+		// 	return
-		}
+		// }
 
 		// 将解析后的 Token 存储到上下文中
 		c.Set("Auth", claims)

oplog/new.go

@@ -0,0 +1,14 @@
+package oplog
+
+import (
+	"encoding/json"
+
+	"git.apinb.com/bsm-sdk/core/utils"
+)
+
+func New(endpoint string, data []*LogItem) {
+	jsonBytes, _ := json.Marshal(data)
+
+	go utils.HttpPost(endpoint, nil, jsonBytes)
+
+}

oplog/types.go

@@ -0,0 +1,23 @@
+package oplog
+
+type LogItem struct {
+	OpID   uint   `json:"op_id"`
+	OpName string `json:"op_name"`
+	OpType string `json:"op_type"`
+	Text   string `json:"text"`
+	Code   string `json:"code"`
+	Level  uint   `json:"level"`
+	Ip     string `json:"ip"`
+	Module string `json:"module"`
+}
+
+var (
+	Type_Login    string = "login"
+	Type_Logout   string = "logout"
+	Type_Register string = "register"
+	Type_Update   string = "update"
+	Type_Delete   string = "delete"
+	Type_Query    string = "query"
+	Type_Other    string = "other"
+	Type_Create   string = "create"
+)

types/db.go

@@ -10,62 +10,68 @@ type (
 
 	// sql options
 	SqlOptions struct {
-		MaxIdleConns    int
+		MaxIdleConns    int `gorm:"column:max_idle_conns;"  json:"max_idle_conns"`
-		MaxOpenConns    int
+		MaxOpenConns    int `gorm:"column:max_open_conns;"  json:"max_open_conns"`
 		ConnMaxLifetime time.Duration
 
-		LogStdout bool
+		LogStdout bool `gorm:"column:log_stdout;"  json:"log_stdout"`
-		Debug     bool
+		Debug     bool `gorm:"column:debug;"  json:"debug"`
 	}
 
 	// standard ID,Identity definition.
 	Std_IDIdentity struct {
-		ID       uint   `gorm:"primarykey;"  json:"id"`
+		ID       uint   `gorm:"column:id;primarykey;"  json:"id"`
-		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;default:uuid_generate_v4()"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
+		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
 	}
 
 	// standard ID,Created,Updated,Deleted definition.
 	Std_IICUDS struct {
-		ID        uint           `gorm:"primarykey;"  json:"id"`
+		ID        uint           `gorm:"column:id;primarykey;"  json:"id"`
-		Identity  string         `gorm:"column:identity;type:varchar(36);uniqueIndex;default:uuid_generate_v4()"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
+		Identity  string         `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
-		CreatedAt time.Time      `json:"created_at"`
+		CreatedAt time.Time      `gorm:"column:created_at;type:TIMESTAMP;" json:"created_at"`
-		UpdatedAt time.Time      `json:"updated_at"`
+		UpdatedAt time.Time      `gorm:"column:updated_at;type:TIMESTAMP;" json:"updated_at"`
-		DeletedAt gorm.DeletedAt `gorm:"index;" json:"deleted_at"`
+		DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:TIMESTAMP;index;" json:"deleted_at"`
-		Status    int8           `gorm:"default:0;index;" json:"status"` // 状态：默认为0，-1禁止，1为正常
+		Status    int8           `gorm:"column:status;default:0;index;" json:"status"` // 状态：默认为0，-1禁止，1为正常
 	}
 
 	// standard ID,Identity,Created,Updated,Deleted,Status definition.
 	Std_ICUD struct {
-		ID        uint           `gorm:"primarykey;"  json:"id"`
+		ID        uint           `gorm:"column:id;primarykey;"  json:"id"`
-		CreatedAt time.Time      `json:"created_at"`
+		CreatedAt time.Time      `gorm:"column:created_at;" json:"created_at"`
-		UpdatedAt time.Time      `json:"updated_at"`
+		UpdatedAt time.Time      `gorm:"column:updated_at;type:TIMESTAMP;" json:"updated_at"`
-		DeletedAt gorm.DeletedAt `gorm:"index;" json:"deleted_at"`
+		DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:TIMESTAMP;index;" json:"deleted_at"`
 	}
 
 	// standard ID,Created definition.
 	Std_IdCreated struct {
-		ID        uint      `gorm:"primarykey;"  json:"id"`
+		ID        uint      `gorm:"column:id;primarykey;"  json:"id"`
-		CreatedAt time.Time `json:"created_at"`
+		CreatedAt time.Time `gorm:"column:created_at;type:TIMESTAMP;" json:"created_at"`
 	}
 
 	// standard PassportID,PassportIdentity definition.
 	Std_Passport struct {
 		PassportID       uint   `gorm:"column:passport_id;Index;" json:"passport_id"`
-		PassportIdentity string `gorm:"column:passport_identity;type:varchar(36);Index;default:uuid_generate_v4()"  json:"passport_identity"` // 用户唯一标识，24位NanoID,36位为ULID
+		PassportIdentity string `gorm:"column:passport_identity;type:varchar(36);Index;"  json:"passport_identity"` // 用户唯一标识，24位NanoID,36位为UUID
+	}
+
+	// standard OwnerID,OwnerIdentity definition.
+	Std_Owner struct {
+		OwnerID       uint   `gorm:"column:owner_id;Index;" json:"owner_id"`
+		OwnerIdentity string `gorm:"column:owner_identity;type:varchar(36);Index;"  json:"owner_identity"` // 用户唯一标识，24位NanoID,36位为UUID
 	}
 
 	// standard ID definition.
 	Std_ID struct {
-		ID uint `gorm:"primarykey;"  json:"id"`
+		ID uint `gorm:"column:id;primarykey;"  json:"id"`
 	}
 
 	// standard Identity definition.
 	Std_Identity struct {
-		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;default:uuid_generate_v4()"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
+		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为UUID
 	}
 
 	// standard Status definition.
 	Std_Status struct {
-		Status int64 `gorm:"default:0;index;" json:"status"` // 状态：默认为0，-1禁止，1为正常
+		Status int64 `gorm:"column:status;default:0;index;" json:"status"` // 状态：默认为0，-1禁止，1为正常
 	}
 )

utils/file.go

@@ -25,7 +25,7 @@ func StringToFile(path, content string) error {
 // rootDir: 文件夹根目录
 // s: 存储文件名的切片
 // filter: 过滤条件：".git", ".idea", ".vscode", ".gitignore", ".gitea", ".github", ".golangci.yml", "*.pyc"
-func FileTree(rootDir string, s []string, filter []string) ([]string, error) {
+func FileTreeByFilter(rootDir string, s []string, filter []string) ([]string, error) {
 	rd, err := os.ReadDir(rootDir)
 	if err != nil {
 		return s, err
@@ -50,7 +50,48 @@ func FileTree(rootDir string, s []string, filter []string) ([]string, error) {
 
 		if fi.IsDir() {
 			fullDir := rootDir + "/" + fi.Name()
-			s, err = FileTree(fullDir, s, filter)
+			s, err = FileTreeByFilter(fullDir, s, filter)
+			if err != nil {
+				return s, err
+			}
+		} else {
+			fullName := rootDir + "/" + fi.Name()
+			s = append(s, fullName)
+		}
+	}
+	return s, nil
+}
+
+// 递归遍历文件夹
+// rootDir: 文件夹根目录
+// s: 存储文件名的切片
+// allow: 允许条件：".zip", ".check"
+func FileTreeBySelect(rootDir string, s []string, allow []string) ([]string, error) {
+	rd, err := os.ReadDir(rootDir)
+	if err != nil {
+		return s, err
+	}
+	for _, fi := range rd {
+		// 检查文件名是否匹配任何一个过滤模式
+		matched := false
+		for _, item := range allow {
+			exists, err := filepath.Match(item, fi.Name())
+			if err != nil {
+				continue
+			}
+			if exists {
+				matched = true
+				break
+			}
+		}
+
+		if !matched {
+			continue
+		}
+
+		if fi.IsDir() {
+			fullDir := rootDir + "/" + fi.Name()
+			s, err = FileTreeBySelect(fullDir, s, allow)
 			if err != nil {
 				return s, err
 			}

utils/net.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -121,6 +122,15 @@ func HttpGet(url string) ([]byte, error) {
 	return body, err
 }
 
+func HttpPostJSON(url string, header map[string]string, data map[string]any) ([]byte, error) {
+	bytes, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+
+	return HttpPost(url, header, bytes)
+}
+
 func HttpPost(url string, header map[string]string, data []byte) ([]byte, error) {
 	var err error
 	reader := bytes.NewBuffer(data)