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 {

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,19 @@
 package middleware
 
 import (
+	"encoding/json"
+	"fmt"
 	"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,7 +33,9 @@ func JwtAuth(redisToken string) gin.HandlerFunc {
 		}
 
 		// 从redis 获取token,判断当前redis 是否为空
-		if redisToken == "" {
+		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()
@@ -41,3 +48,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,32 @@
+package oplog
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+)
+
+func New(endpoint string, data LogRequest) error {
+	go PostLog(data, endpoint)
+	return nil
+}
+func PostLog(data LogRequest, endpoint string) (resp *http.Response, err error) {
+	jsonBytes, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", endpoint, bytes.NewBuffer(jsonBytes))
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	client := &http.Client{}
+	resp, err = client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	return
+}

oplog/types.go

@@ -0,0 +1,21 @@
+package oplog
+
+type LogRequest struct {
+	Data []*LogItem `json:"data"`
+}
+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"
+)