fix

conf/types.go

@@ -1,12 +1,14 @@
 package conf
 
 type Base struct {
-	Service   string `yaml:"Service"`   // 服务名称
-	Port      string `yaml:"Port"`      // 服务监听端口,0为自动随机端口
-	Cache     string `yaml:"Cache"`     // REDIS缓存
-	SecretKey string `yaml:"SecretKey"` // 服务秘钥
-	BindIP    string `yaml:"BindIP"`    // 绑定IP
-	Addr      string `yaml:"Addr"`
+	Service        string `yaml:"Service"`   // 服务名称
+	Port           string `yaml:"Port"`      // 服务监听端口,0为自动随机端口
+	Cache          string `yaml:"Cache"`     // REDIS缓存
+	SecretKey      string `yaml:"SecretKey"` // 服务秘钥
+	BindIP         string `yaml:"BindIP"`    // 绑定IP
+	Addr           string `yaml:"Addr"`
+	OnMicroService bool   `yaml:"OnMicroService"`
+	LoginUrl       string `yaml:"LoginUrl"`
 }
 
 type DBConf struct {
@@ -48,11 +50,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 {

errcode/errcode.go

@@ -15,13 +15,18 @@ var (
 
 // standard error code ,start:110
 var (
-	ErrEmpty         = NewError(110, "Data Is Empty")
-	ErrRequestParse  = NewError(111, "Request Parse Fail")
-	ErrRequestMust   = NewError(112, "Request Params Required")
-	ErrPermission    = NewError(113, "Permission Denied")
-	ErrJsonUnmarshal = NewError(114, "Json Unmarshal Fail")
-	ErrJsonMarshal   = NewError(115, "Json Marshal Fail")
-	ErrInternal      = NewError(116, "Internal Server Error")
+	ErrEmpty           = NewError(110, "Data Is Empty")
+	ErrRequestParse    = NewError(111, "Request Parse Fail")
+	ErrRequestMust     = NewError(112, "Request Params Required")
+	ErrPermission      = NewError(113, "Permission Denied")
+	ErrJsonUnmarshal   = NewError(114, "Json Unmarshal Fail")
+	ErrJsonMarshal     = NewError(115, "Json Marshal Fail")
+	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"`
-	Msg  string `json:"msg"`
-	Data any    `json:"data"`
+	Code    int32  `json:"code"`
+	Message string `json:"message"`
+	Result  any    `json:"result"`
 }
 
 func (reply *Reply) Success(ctx *gin.Context, data any) {
-	reply.Code = 200
-	reply.Data = data
-	reply.Msg = ""
+	reply.Code = 0
+	reply.Result = data
+	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)

infra/service.go

@@ -17,14 +17,14 @@ var (
 
 type service struct{}
 
-func (s *service) Register(cli *clientv3.Client, serviceName string, port int) error {
+func (s *service) Register(cli *clientv3.Client, serviceName string, port string) error {
 	lease := clientv3.NewLease(cli)
 	grantResp, err := lease.Grant(context.TODO(), 5)
 	if err != nil {
 		return err
 	}
 
-	serviceAddr := utils.GetLocationIP() + ":" + utils.Int2String(port)
+	serviceAddr := utils.GetLocationIP() + ":" + port
 
 	key := RootPrefix + serviceName + "/" + utils.Int642String(time.Now().UnixNano())
 	_, err = cli.KV.Put(context.TODO(), key, serviceAddr, clientv3.WithLease(grantResp.ID))

middleware/jwt.go

@@ -1,14 +1,18 @@
 package middleware
 
 import (
+	"encoding/json"
 	"log"
 	"net/http"
 
+	"git.apinb.com/bsm-sdk/core/cache/redis"
 	"git.apinb.com/bsm-sdk/core/crypto/encipher"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/types"
 	"github.com/gin-gonic/gin"
 )
 
-func JwtAuth(redisToken string) gin.HandlerFunc {
+func JwtAuth(redis *redis.RedisClient) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		// 从请求头中获取 Authorization
 		authHeader := c.GetHeader("Authorization")
@@ -28,12 +32,14 @@ func JwtAuth(redisToken string) gin.HandlerFunc {
 		}
 
 		// 从redis 获取token,判断当前redis 是否为空
-		if redisToken == "" {
-			log.Println("redis异常", "Token status unauthorized")
-			c.JSON(http.StatusUnauthorized, gin.H{"error": "Token status unauthorized"})
-			c.Abort()
-			return
-		}
+		// tokenKey := fmt.Sprintf("%d-%s-%s", claims.ID, claims.Role, "token")
+		// redisToken := redis.Client.Get(redis.Ctx, tokenKey)
+		// if redisToken.Val() == "" {
+		// 	log.Println("redis异常", "Token status unauthorized")
+		// 	c.JSON(http.StatusUnauthorized, gin.H{"error": "Token status unauthorized"})
+		// 	c.Abort()
+		// 	return
+		// }
 
 		// 将解析后的 Token 存储到上下文中
 		c.Set("Auth", claims)
@@ -41,3 +47,26 @@ func JwtAuth(redisToken string) gin.HandlerFunc {
 		c.Next()
 	}
 }
+
+// 获取上下文用户登录信息
+func ParseAuth(c *gin.Context) (*types.JwtClaims, error) {
+	claims, ok := c.Get("Auth")
+	if !ok {
+		log.Printf("获取登录信息异常: %v", errcode.ErrJWTAuthNotFound)
+		return nil, errcode.ErrJWTAuthNotFound
+	}
+
+	json_claims, err := json.Marshal(claims)
+	if err != nil {
+		log.Printf("解析json异常: %v", err)
+		return nil, errcode.ErrJsonMarshal
+	}
+
+	var auth *types.JwtClaims
+	if err := json.Unmarshal(json_claims, &auth); err != nil {
+		log.Printf("解析json异常: %v", err)
+		return nil, errcode.ErrJsonUnmarshal
+	}
+
+	return auth, nil
+}

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,18 @@
+package oplog
+
+type LogItem struct {
+	OpID   uint   `json:"op_id"`
+	OpName string `json:"op_name"`
+	OpType string `json:"op_type"`
+	Text   string `json:"text"`
+}
+
+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"
+)

types/db.go

@@ -21,15 +21,15 @@ type (
 	// standard ID,Identity definition.
 	Std_IDIdentity struct {
 		ID       uint   `gorm:"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"`
-		Identity  string         `gorm:"column:identity;type:varchar(36);uniqueIndex;default:uuid_generate_v4()"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
-		CreatedAt time.Time      `json:"created_at"`
-		UpdatedAt time.Time      `json:"updated_at"`
+		Identity  string         `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
+		CreatedAt time.Time      `gorm:"" json:"created_at"`
+		UpdatedAt time.Time      `gorm:"" json:"updated_at"`
 		DeletedAt gorm.DeletedAt `gorm:"index;" json:"deleted_at"`
 		Status    int8           `gorm:"default:0;index;" json:"status"` // 状态：默认为0，-1禁止，1为正常
 	}
@@ -37,21 +37,27 @@ type (
 	// standard ID,Identity,Created,Updated,Deleted,Status definition.
 	Std_ICUD struct {
 		ID        uint           `gorm:"primarykey;"  json:"id"`
-		CreatedAt time.Time      `json:"created_at"`
-		UpdatedAt time.Time      `json:"updated_at"`
+		CreatedAt time.Time      `gorm:"" json:"created_at"`
+		UpdatedAt time.Time      `gorm:"" json:"updated_at"`
 		DeletedAt gorm.DeletedAt `gorm:"index;" json:"deleted_at"`
 	}
 
 	// standard ID,Created definition.
 	Std_IdCreated struct {
 		ID        uint      `gorm:"primarykey;"  json:"id"`
-		CreatedAt time.Time `json:"created_at"`
+		CreatedAt time.Time `gorm:"" 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.
@@ -61,7 +67,7 @@ type (
 
 	// 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.