From 0b4478cf6c0eb509c95a9bec2cc7bda37b259e10 Mon Sep 17 00:00:00 2001
From: 905086 <k2049@qq.com>
Date: Sat, 07 Nov 2026 19:06:06 +0800
Subject: [PATCH] feat: 新增工具管理功能及工具下载安装流程

---
 server/handlers/auth.go |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/server/handlers/auth.go b/server/handlers/auth.go
index f6fe7c2..75dafc9 100644
--- a/server/handlers/auth.go
+++ b/server/handlers/auth.go
@@ -155,17 +155,24 @@
 		c.JSON(http.StatusOK, gin.H{"code": 1, "msg": "用户不存在"})
 		return
 	}
-	// 查询会员有效期(取最大的未过期时间)
+	// 查询会员有效期(永久卡 expired_at 为 NULL;冻结的密钥不计入会员;取最大的未过期时间)
 	var keys []models.MemberKey
-	config.DB.Where("user_id = ? AND expired_at > ?", userID, time.Now()).Find(&keys)
+	config.DB.Where("user_id = ? AND frozen = ? AND (expired_at IS NULL OR expired_at > ?)", userID, false, time.Now()).Find(&keys)
+	permanent := false
 	var expire *time.Time
 	for i := range keys {
+		if keys[i].ExpiredAt == nil {
+			permanent = true
+			continue
+		}
 		if expire == nil || keys[i].ExpiredAt.After(*expire) {
 			expire = keys[i].ExpiredAt
 		}
 	}
-	member := gin.H{"is_member": expire != nil}
-	if expire != nil {
+	member := gin.H{"is_member": permanent || expire != nil}
+	if permanent {
+		member["expire_at"] = "永久"
+	} else if expire != nil {
 		member["expire_at"] = expire.Format("2006-01-02 15:04:05")
 	}
 	c.JSON(http.StatusOK, gin.H{"code": 0, "data": gin.H{

--
Gitblit v1.10.0