f

internal/domains/api/dto/pdfg_dto.go

@@ -5,7 +5,6 @@ type PDFG01GZReq struct {
 	Name                  string `json:"name" validate:"required,min=1,validName"`
 	IDCard                string `json:"id_card" validate:"required,validIDCard"`
 	MobileNo              string `json:"mobile_no" validate:"required,min=11,max=11,validMobileNo"`
-	AuthAuthorizeFileCode string `json:"auth_authorize_file_code" validate:"required"` // IVYZ5A9O需要
 	Authorized            string `json:"authorized" validate:"required,oneof=0 1"`      // 授权标识，0或1
 }
 

internal/domains/api/services/processors/pdfg/pdfg01gz_processor.go

@@ -37,18 +37,19 @@ func ProcessPDFG01GZRequest(ctx context.Context, params []byte, deps *processors
 		zap.String("id_card", paramsDto.IDCard),
 		zap.String("mobile_no", paramsDto.MobileNo),
 		zap.String("authorized", paramsDto.Authorized),
-		zap.String("auth_authorize_file_code", paramsDto.AuthAuthorizeFileCode),
 	)
 
 	// 从context获取config（如果存在）
 	var cacheTTL time.Duration = 24 * time.Hour
 	var cacheDir string
+	var apiDomain string
 	if cfg, ok := ctx.Value("config").(*config.Config); ok && cfg != nil {
 		cacheTTL = cfg.PDFGen.Cache.TTL
 		if cacheTTL == 0 {
 			cacheTTL = 24 * time.Hour
 		}
 		cacheDir = cfg.PDFGen.Cache.CacheDir
+		apiDomain = cfg.API.Domain
 	}
 
 	// 获取最大缓存大小
@@ -112,12 +113,15 @@ func ProcessPDFG01GZRequest(ctx context.Context, params []byte, deps *processors
 		time.Sleep(2 * time.Second)
 
 		// 生成下载链接（基于报告ID）
-		downloadURL := generateDownloadURL(reportID)
+		downloadURL := generateDownloadURL(apiDomain, reportID)
+		expiresAt := createdAt.Add(cacheTTL)
 		return json.Marshal(map[string]interface{}{
 			"download_url": downloadURL,
 			"report_id":    reportID,
 			"cached":       true,
 			"created_at":   createdAt.Format(time.RFC3339),
+			"expires_at":   expiresAt.Format(time.RFC3339),
+			"ttl_seconds":  int(cacheTTL.Seconds()),
 		})
 	}
 
@@ -187,7 +191,8 @@ func ProcessPDFG01GZRequest(ctx context.Context, params []byte, deps *processors
 	}
 
 	// 生成下载链接（基于报告ID）
-	downloadURL := generateDownloadURL(reportID)
+	downloadURL := generateDownloadURL(apiDomain, reportID)
+	expiresAt := time.Now().Add(cacheTTL)
 
 	zapLogger.Info("PDF生成成功",
 		zap.String("name", paramsDto.Name),
@@ -202,6 +207,8 @@ func ProcessPDFG01GZRequest(ctx context.Context, params []byte, deps *processors
 		"report_id":     reportID,
 		"report_number": reportNumber,
 		"cached":        false,
+		"expires_at":    expiresAt.Format(time.RFC3339),
+		"ttl_seconds":   int(cacheTTL.Seconds()),
 	})
 }
 
@@ -219,35 +226,29 @@ func collectAPIData(ctx context.Context, params dto.PDFG01GZReq, deps *processor
 
 	results := make(chan processorResult, 5)
 
-	// 调用IVYZ5A9O - 需要: name, id_card, auth_authorize_file_code
+	// 调用JRZQ0L85 - 需要: name, id_card, mobile_no
 	go func() {
 		defer func() {
 			if r := recover(); r != nil {
-				logger.Error("调用IVYZ5A9O处理器时发生panic",
+				logger.Error("调用JRZQ0L85处理器时发生panic",
 					zap.Any("panic", r),
 				)
-				results <- processorResult{"IVYZ5A9O", nil, fmt.Errorf("处理器panic: %v", r)}
+				results <- processorResult{"JRZQ0L85", nil, fmt.Errorf("处理器panic: %v", r)}
 			}
 		}()
-		// 检查必需字段
-		if params.AuthAuthorizeFileCode == "" {
-			logger.Warn("IVYZ5A9O缺少auth_authorize_file_code字段，跳过调用")
-			results <- processorResult{"IVYZ5A9O", nil, fmt.Errorf("缺少必需字段: auth_authorize_file_code")}
-			return
+		jrzq0l85Params := map[string]interface{}{
+			"name":     params.Name,
+			"id_card":  params.IDCard,
+			"mobileNo": params.MobileNo,
 		}
-		ivyzParams := map[string]interface{}{
-			"name":                    params.Name,
-			"id_card":                 params.IDCard,
-			"auth_authorize_file_code": params.AuthAuthorizeFileCode,
-		}
-		paramsBytes, err := json.Marshal(ivyzParams)
+		paramsBytes, err := json.Marshal(jrzq0l85Params)
 		if err != nil {
-			logger.Warn("序列化IVYZ5A9O参数失败", zap.Error(err))
-			results <- processorResult{"IVYZ5A9O", nil, err}
+			logger.Warn("序列化JRZQ0L85参数失败", zap.Error(err))
+			results <- processorResult{"JRZQ0L85", nil, err}
 			return
 		}
-		data, err := callProcessor(ctx, "IVYZ5A9O", paramsBytes, deps)
-		results <- processorResult{"IVYZ5A9O", data, err}
+		data, err := callProcessor(ctx, "JRZQ0L85", paramsBytes, deps)
+		results <- processorResult{"JRZQ0L85", data, err}
 	}()
 
 	// 调用JRZQ8A2D - 需要: name, id_card, mobile_no, authorized
@@ -501,9 +502,13 @@ func generateReportNumber() string {
 }
 
 // generateDownloadURL 生成下载链接（基于报告ID/缓存键）
-func generateDownloadURL(reportID string) string {
-	// 这里应该生成实际的下载URL
-	// 暂时返回一个占位符，实际应该根据服务器配置生成
-	return fmt.Sprintf("/api/v1/pdfg/download?id=%s", reportID)
+// apiDomain: 外部可访问的API域名，如 api.tianyuanapi.com
+func generateDownloadURL(apiDomain, reportID string) string {
+	if apiDomain == "" {
+		// 兜底：保留相对路径，方便本地/测试环境使用
+		return fmt.Sprintf("/api/v1/pdfg/download?id=%s", reportID)
+	}
+	// 生成完整链接，例如：https://api.tianyuanapi.com/api/v1/pdfg/download?id=xxx
+	return fmt.Sprintf("https://%s/api/v1/pdfg/download?id=%s", apiDomain, reportID)
 }