Merge branch 'master' of http://124.70.149.18:10880/sunsheng/cmf

comm

@@ -1 +1 @@
-Subproject commit 91d45d091156ee309276aa62c244c97850f670a9
+Subproject commit f4266e04a734dc123c65dd48e8fc30a51a92b9e0

pack-cmf/docker-compose.yaml

@@ -85,3 +85,10 @@ services:
       - cmf-bus
     environment: 
       NATS: nats://cmf-bus:4222
+  cmf-client:
+    image: registry.cn-chengdu.aliyuncs.com/infish/cmf-client:v1.0.0
+    restart: always
+    depends_on:
+      - cmf-bus
+    environment: 
+      NATS: nats://cmf-bus:4222

pack-cmf/nginx/conf.d/default.conf

@@ -45,6 +45,9 @@ server {
     location /cmf/ {
        proxy_pass  http://cmf-srv:3001/cmf/;
     }
+    location /cmfclient/ {
+       proxy_pass  http://cmf-client:3001/cmf/;
+    }
 
 
     #nats-exporter

src/db/db.go

@@ -38,7 +38,7 @@ func (db *MongoDB) GetOrCreateDatabase(name string) *mongo.Database {
 
 func NewMongoDB(bus *comm.NatsBus) *MongoDB {
 
-	inst, err := bus.NewMongoDBFromConfigDev("cmf-mongo")
+	inst, err := bus.NewMongoDBFromConfig("cmf-mongo")
 
 	if err != nil {
 		fmt.Println(err)

src/middleware/auth.go

@@ -39,11 +39,10 @@ func CasdoorAuthMiddleware() gin.HandlerFunc {
 			return
 		}
 		// 检查 token 是否过期
-		if claims.ExpiresAt.Compare(time.Now()) < 0 {
+		if time.Now().After(claims.ExpiresAt.Time) {
 			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Token has expired"})
 			return
 		}
-
 		// 将用户信息存储在上下文中，以便后续使用
 		c.Set("casdoor_user", claims)