+
{visibleRouteDefs.length} / {routeDefs.length} 项
+
{visibleRouteDefs.map((item) => (
@@ -720,6 +721,7 @@ export function CKBConfigPanel({ initialTab = 'overview', fullBleed }: { initial
))}
+
)}
diff --git a/soul-api/internal/handler/ckb.go b/soul-api/internal/handler/ckb.go
index 6e3752e3..deb940c3 100644
--- a/soul-api/internal/handler/ckb.go
+++ b/soul-api/internal/handler/ckb.go
@@ -287,7 +287,6 @@ func pushLeadToCKB(name, phone, wechatId, leadKey string) (ckbLeadPushResult, er
}
q.Set("sign", params["sign"].(string))
reqURL := ckbAPIURL + "?" + q.Encode()
- fmt.Printf("[存客宝 scenarios] 请求 URL（GET）: %s\n", reqURL)
resp, err := http.Get(reqURL)
if err != nil {
return ckbLeadPushResult{}, err
@@ -328,7 +327,8 @@ func resolvePersonForLead(db *gorm.DB, targetUserID string) (model.Person, bool)
return model.Person{}, false
}
-// resolveLeadPlanAPIKeyForRetry 与 GET /api/db/ckb-leads?mode=contact 中 planApiKey 展示顺序一致：
+// resolveLeadPlanAPIKeyForRetry 解析本条线索应采信的存客宝计划 apiKey（GET /api/db/ckb-leads mode=contact 的 planApiKey、
+// 以及 retryOneLeadRecord 重推 pushLeadToCKB 共用本函数，禁止两处手写两套顺序）：
// 1) ckb_lead_records.plan_api_key
// 2) action/source 默认（join/match → 内置 ckbAPIKey；lead+index_link_button → getCkbLeadApiKey）
// 3) 仍为空：按 target_person_id 或 params.targetUserId 查人物 persons.ckb_api_key
@@ -571,8 +571,10 @@ func CKBJoin(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"success": false, "message": "无效的加入类型"})
return
}
+ // 资源对接：真实用户须已购章节；管理端存客宝工作台「接口测试」固定 userId=admin_test，仅测连通性不做购课校验
if body.Type == "investor" && body.UserID != "" {
- if !userHasContentPurchase(database.DB(), body.UserID) {
+ uid := strings.TrimSpace(body.UserID)
+ if uid != "admin_test" && !userHasContentPurchase(database.DB(), body.UserID) {
c.JSON(http.StatusOK, gin.H{
"success": false,
"error": "请先购买任意章节后再申请资源对接",
diff --git a/soul-api/internal/handler/ckb_open.go b/soul-api/internal/handler/ckb_open.go
index 7e46bbea..3b643929 100644
--- a/soul-api/internal/handler/ckb_open.go
+++ b/soul-api/internal/handler/ckb_open.go
@@ -11,6 +11,7 @@ import (
"net/url"
"strconv"
"strings"
+ "sync"
"time"
"github.com/gin-gonic/gin"
@@ -38,12 +39,30 @@ func getCkbOpenConfig() (apiKey, account string) {
return
}
-// ckbOpenGetToken 获取开放 API JWT
+var (
+ ckbOpenTokenMu sync.Mutex
+ ckbOpenCachedToken string
+ ckbOpenCachedExpiry time.Time
+)
+
+// ckbOpenTokenCacheTTL 开放 API JWT 内存缓存时长（避免 GET /api/db/persons 等高频路径对存客宝重复 /v1/open/auth/token）
+const ckbOpenTokenCacheTTL = 45 * time.Minute
+
+// ckbOpenGetToken 获取开放 API JWT（带进程内短期缓存）
func ckbOpenGetToken() (string, error) {
apiKey, account := getCkbOpenConfig()
if apiKey == "" || account == "" {
return "", fmt.Errorf("无效的apiKey：CKB_OPEN_API_KEY 或 CKB_OPEN_ACCOUNT 未配置，请在后端 .env 中配置后重试")
}
+
+ ckbOpenTokenMu.Lock()
+ if ckbOpenCachedToken != "" && time.Now().Before(ckbOpenCachedExpiry) {
+ tok := ckbOpenCachedToken
+ ckbOpenTokenMu.Unlock()
+ return tok, nil
+ }
+ ckbOpenTokenMu.Unlock()
+
ts := time.Now().Unix()
sign := ckbOpenSign(account, ts, apiKey)
authBody := map[string]interface{}{
@@ -74,7 +93,13 @@ func ckbOpenGetToken() (string, error) {
}
return "", fmt.Errorf("%s", msg)
}
- return authResult.Data.Token, nil
+
+ ckbOpenTokenMu.Lock()
+ ckbOpenCachedToken = authResult.Data.Token
+ ckbOpenCachedExpiry = time.Now().Add(ckbOpenTokenCacheTTL)
+ out := ckbOpenCachedToken
+ ckbOpenTokenMu.Unlock()
+ return out, nil
}
// ckbOpenCreatePlan 调用 /v1/plan/create 创建获客计划，返回 planId、存客宝原始 data、以及完整响应（失败时便于排查）
diff --git a/soul-api/internal/handler/db_ckb_leads.go b/soul-api/internal/handler/db_ckb_leads.go
index b71d934e..88707b43 100644
--- a/soul-api/internal/handler/db_ckb_leads.go
+++ b/soul-api/internal/handler/db_ckb_leads.go
@@ -1,10 +1,8 @@
package handler
import (
- "bytes"
"encoding/json"
"fmt"
- "io"
"net/http"
"strconv"
"strings"
@@ -151,31 +149,18 @@ func DBCKBLeadList(c *gin.Context) {
}
out := make([]gin.H, 0, len(records))
for _, r := range records {
- // 兜底：历史数据 plan_api_key 可能为空（已迁移但仍有漏网），按 action 回填展示，不改库
- planKey := strings.TrimSpace(r.PlanAPIKey)
- if planKey == "" {
- if strings.TrimSpace(r.Action) == "join" || strings.TrimSpace(r.Action) == "match" {
- planKey = ckbAPIKey
- } else if strings.TrimSpace(r.Action) == "lead" && r.Source == "index_link_button" {
- planKey = getCkbLeadApiKey()
- }
- }
+ // 与重推 retryOneLeadRecord 共用 resolveLeadPlanAPIKeyForRetry，避免列表「计划Key」与实发 apiKey 再分叉
+ var paramsMap map[string]interface{}
+ _ = json.Unmarshal([]byte(r.Params), ¶msMap)
+ planKey := resolveLeadPlanAPIKeyForRetry(db, r, paramsMap)
personName := ""
ckbPlanId := int64(0)
if p := personMap[r.TargetPersonID]; p != nil {
personName = p.Name
ckbPlanId = p.CkbPlanID
- // 兜底：迁移后计划 key 多写在 persons.ckb_api_key，但 lead_records.plan_api_key 可能仍为空
- // 此处仅用于管理端回显（前端会做掩码展示），不改库
- if planKey == "" && strings.TrimSpace(p.CkbApiKey) != "" {
- planKey = strings.TrimSpace(p.CkbApiKey)
- }
} else if strings.TrimSpace(r.TargetPersonID) == "" && r.Source == "index_link_button" && indexLinkFallback != nil {
personName = indexLinkFallback.Name
ckbPlanId = indexLinkFallback.CkbPlanID
- if planKey == "" && strings.TrimSpace(indexLinkFallback.CkbApiKey) != "" {
- planKey = strings.TrimSpace(indexLinkFallback.CkbApiKey)
- }
}
displayNick := r.Nickname
userAvatar := ""
@@ -315,48 +300,13 @@ func DBCKBLeadList(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"success": true, "records": out, "total": total, "page": page, "pageSize": pageSize})
}
-func logCkbLeadRetryResponse(resp gin.H) {
- b, err := json.MarshalIndent(resp, "", " ")
- if err != nil {
- fmt.Printf("[DBCKBLeadRetry] response(marshal err=%v): %+v\n", err, resp)
- return
- }
- fmt.Printf("[DBCKBLeadRetry] response JSON:\n%s\n", string(b))
-}
-
-func logCkbLeadRetryRequest(raw []byte, readErr error) {
- if readErr != nil {
- fmt.Printf("[DBCKBLeadRetry] request body read error: %v\n", readErr)
- return
- }
- s := strings.TrimSpace(string(raw))
- if s == "" {
- fmt.Printf("[DBCKBLeadRetry] request body: (empty)\n")
- return
- }
- if json.Valid([]byte(s)) {
- var buf bytes.Buffer
- if err := json.Indent(&buf, []byte(s), "", " "); err == nil {
- fmt.Printf("[DBCKBLeadRetry] request JSON:\n%s\n", buf.String())
- return
- }
- }
- fmt.Printf("[DBCKBLeadRetry] request body: %s\n", s)
-}
-
// DBCKBLeadRetry POST /api/db/ckb-leads/retry 管理端-手动重推单条失败线索
func DBCKBLeadRetry(c *gin.Context) {
- raw, readErr := io.ReadAll(c.Request.Body)
- c.Request.Body = io.NopCloser(bytes.NewBuffer(raw))
- logCkbLeadRetryRequest(raw, readErr)
-
var body struct {
ID int64 `json:"id" binding:"required"`
}
if err := c.ShouldBindJSON(&body); err != nil || body.ID <= 0 {
- resp := gin.H{"success": false, "error": "缺少有效 id"}
- logCkbLeadRetryResponse(resp)
- c.JSON(http.StatusOK, resp)
+ c.JSON(http.StatusOK, gin.H{"success": false, "error": "缺少有效 id"})
return
}
ok, err := RetryCkbLeadByID(c.Request.Context(), body.ID)
@@ -365,20 +315,16 @@ func DBCKBLeadRetry(c *gin.Context) {
if msg == "" {
msg = "重推失败"
}
- resp := gin.H{"success": false, "error": msg}
- logCkbLeadRetryResponse(resp)
- c.JSON(http.StatusOK, resp)
+ c.JSON(http.StatusOK, gin.H{"success": false, "error": msg})
return
}
db := database.DB()
var r model.CkbLeadRecord
if err := db.Where("id = ?", body.ID).First(&r).Error; err != nil {
- resp := gin.H{"success": true, "pushed": ok}
- logCkbLeadRetryResponse(resp)
- c.JSON(http.StatusOK, resp)
+ c.JSON(http.StatusOK, gin.H{"success": true, "pushed": ok})
return
}
- resp := gin.H{
+ c.JSON(http.StatusOK, gin.H{
"success": true,
"pushed": ok,
"record": gin.H{
@@ -392,9 +338,7 @@ func DBCKBLeadRetry(c *gin.Context) {
"lastPushAt": r.LastPushAt,
"nextRetryAt": r.NextRetryAt,
},
- }
- logCkbLeadRetryResponse(resp)
- c.JSON(http.StatusOK, resp)
+ })
}
// DBCKBLeadDelete POST /api/db/ckb-leads/delete 管理端-删除一条留资记录（运营清理误报/测试数据）
diff --git a/soul-api/internal/handler/db_person.go b/soul-api/internal/handler/db_person.go
index 11a23cfc..1ef19333 100644
--- a/soul-api/internal/handler/db_person.go
+++ b/soul-api/internal/handler/db_person.go
@@ -129,6 +129,15 @@ func syncMissingSuperIndividualsAsPersons(db *gorm.DB) {
for _, b := range bound {
boundSet[strings.TrimSpace(b)] = struct{}{}
}
+ // 未配置「超级个体统一获客计划」时，创建 Person 走 createPersonMinimal，必须先过存客宝开放鉴权。
+ // 鉴权失败若仍逐用户 ensurePersonForUser，会对每个超级个体各打一条相同错误，刷屏且拖慢 /api/db/persons。
+ if _, sharedOk := loadSuperIndividualSharedPlanConfig(db); !sharedOk {
+ if _, err := ckbOpenGetToken(); err != nil {
+ log.Printf("[persons] sync super-individual skipped (need CKB open API or shared plan): %v — configure CKB_OPEN_API_KEY + CKB_OPEN_ACCOUNT, or system_config key %s",
+ err, SuperIndividualSharedPlanConfigKey)
+ return
+ }
+ }
any := false
for _, uid := range ids {
uid = strings.TrimSpace(uid)