diff --git a/boot/ssw-admin/src/main/resources/application.yml b/boot/ssw-admin/src/main/resources/application.yml
index ec23d55..7c9b6c6 100644
--- a/boot/ssw-admin/src/main/resources/application.yml
+++ b/boot/ssw-admin/src/main/resources/application.yml
@@ -8,9 +8,11 @@ spring:
application:
name: ssw-admin # 应用名称,用于服务注册/发现、日志目录等标识
profiles:
- # 指定激活的环境配置文件(默认加载 application-{active}.yml)
- # 可选值:dev(开发环境-默认)、test(测试环境)、preview(预生产)、prod(生产环境)
- active: dev
+ # 默认激活 dev 环境 + full 角色 (运营方全量)。
+ # 数据持有方节点覆盖为: --spring.profiles.active=dev,tdc (或 prod,tdc)
+ # 角色 profile yml 在 application-{role}.yml, Maven profile 控制打哪些子系统 jar.
+ # 可选值: env=dev|test|preview|prod / role=full|tdc|sswflow
+ active: dev,full
# 文件上传配置(Spring Servlet 多文件上传)
servlet:
multipart:
@@ -203,6 +205,8 @@ gateway:
- /api/ssw/sswflow/FlowRun/Internal/**
# tds → sswflow 内部 dataset 同步(上架数据产品时):App-Code + X-Internal-Token [TDS-SSWFLOW-BINDING §10 V1.2]
- /api/ssw/sswflow/Dataset/Internal/**
+ # tdc → tds 内部桥接(业务全景聚合):App-Code=tdc + X-Internal-Token [TDC 跨系统读 §Bridge]
+ - /api/ssw/tds/Bridge/**
white-ip: # 允许访问block-url的IP白名单(支持网段,如192.168.)
## 配置示例:
# - 192.168.
@@ -259,6 +263,10 @@ fisco:
tdc:
internal-secret: ""
+# tds 内部桥接密钥(TDC 经内部网络调 /api/ssw/tds/Bridge/** 时校验 X-Internal-Token;本地可空)
+tds:
+ internal-secret: ""
+
k8s:
enabled: true
namespace: data-space
diff --git a/boot/ssw-sswflow/ssw-sswflow-biz/src/main/java/ssw/sswflow/engine/NaxComputeEngine.java b/boot/ssw-sswflow/ssw-sswflow-biz/src/main/java/ssw/sswflow/engine/NaxComputeEngine.java
index d233661..0887e55 100644
--- a/boot/ssw-sswflow/ssw-sswflow-biz/src/main/java/ssw/sswflow/engine/NaxComputeEngine.java
+++ b/boot/ssw-sswflow/ssw-sswflow-biz/src/main/java/ssw/sswflow/engine/NaxComputeEngine.java
@@ -37,8 +37,14 @@ import java.util.concurrent.TimeUnit;
* 适配器返回 {@code status="FALLBACK"},本类直接转发到兜底引擎。
*
* @author SSWFlow
+ *
+ * [V1.5 边界] 本类是 dev-only fallback:{@code @Profile("dev")} 限流,prod 环境不注册。
+ * 生产路径走 TDC Nax 镜像({@code boot/docker/ssw-nax-runtime}),由 TDC 沙盒 runtime
+ * 执行真实 Nax 算法——保证"原始数据不出域"。
+ * 详见 {@code docs/tds/SSWFLOW_BINDING.md §11 V1.5}。
*/
@Slf4j
+@org.springframework.context.annotation.Profile("dev")
@Component
public class NaxComputeEngine implements ComputeEngine {
diff --git a/boot/ssw-tdc/ssw-tdc-biz/pom.xml b/boot/ssw-tdc/ssw-tdc-biz/pom.xml
index 0853f41..a757f9d 100644
--- a/boot/ssw-tdc/ssw-tdc-biz/pom.xml
+++ b/boot/ssw-tdc/ssw-tdc-biz/pom.xml
@@ -36,5 +36,58 @@
lombok
provided
+
+
+
+ com.jnpf
+ jnpf-extend-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-system-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-scheduletask-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-message-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-permission-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-exception
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-oauth-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-app-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-flowable-controller
+ ${project.version}
+
+
+ com.jnpf
+ jnpf-common-i18n
+
-
+
\ No newline at end of file
diff --git a/boot/ssw-tdc/ssw-tdc-biz/src/main/java/ssw/tdc/TdcAdminApplication.java b/boot/ssw-tdc/ssw-tdc-biz/src/main/java/ssw/tdc/TdcAdminApplication.java
new file mode 100644
index 0000000..b84a0b8
--- /dev/null
+++ b/boot/ssw-tdc/ssw-tdc-biz/src/main/java/ssw/tdc/TdcAdminApplication.java
@@ -0,0 +1,46 @@
+package ssw.tdc;
+
+import jnpf.util.context.SpringContext;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.x.file.storage.spring.EnableFileStorage;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * TDC 连接器(数据持有方本地代理)独立可执行入口 [V1.5.9]。
+ *
+ * 与 {@link ssw.SswAdminApplication}(中央 SSWFlow 平台聚合入口)的关键差异:
+ *
+ * - 只跑 TDC 业务({@code ssw.tdc.*} 子树),不打包 TDS / SSWFLOW 业务类——VM 内体积小;
+ * - 不依赖 JNPF 主库 {@code j7}(独立 TDC 只连自己的 {@code tdc_node1} / {@code tdc} 库);
+ * - 对外暴露的端点与中央 SSWFlow 的 TDC 端点一致({@code /api/ssw/tdc/*}),
+ * 上游 SSWFLOW/TDS 通过 HTTP 调用无差异(App-Code + X-Internal-Token 鉴权);
+ * - {@code @EnableScheduling + @EnableAsync} 由本主类显式声明,不再依赖
+ * {@code HostingJobTicker} 的隐式 enable(兼容 standalone 模式)。
+ *
+ *
+ * 部署形态参考 {@code docs/scard/VM_DEPLOY.md}:VM 内跑本 jar + Go scard connector,
+ * 对接本机 SSWFLOW 平台。详见 {@code docs/tds/SSWFLOW_BINDING.md §12 V1.5.9}。
+ *
+ * @author SSW-TDC
+ */
+@Slf4j
+@SpringBootApplication(scanBasePackages = {"jnpf", "ssw.common", "ssw.tdc"}, exclude = {DataSourceAutoConfiguration.class})
+@EnableFileStorage
+@EnableScheduling
+@EnableAsync
+public class TdcAdminApplication extends SpringBootServletInitializer {
+
+ public static void main(String[] args) {
+ SpringApplication springApplication = new SpringApplication(TdcAdminApplication.class);
+ // [V1.5.9] 复用 ssw-admin 的修复:repackage fat-jar 后 META-INF/spring 被提到根目录,
+ // LaunchedClassLoader 读不到——必须代码注册 SpringContext initializer。
+ springApplication.addInitializers(new SpringContext());
+ springApplication.run(args);
+ log.error("TDC connector standalone 启动完成(V1.5.9)");
+ }
+}
\ No newline at end of file
diff --git a/boot/ssw-tdc/ssw-tdc-biz/src/main/java/ssw/tdc/client/K8sSandboxClient.java b/boot/ssw-tdc/ssw-tdc-biz/src/main/java/ssw/tdc/client/K8sSandboxClient.java
index a2b8671..9a29eeb 100644
--- a/boot/ssw-tdc/ssw-tdc-biz/src/main/java/ssw/tdc/client/K8sSandboxClient.java
+++ b/boot/ssw-tdc/ssw-tdc-biz/src/main/java/ssw/tdc/client/K8sSandboxClient.java
@@ -44,9 +44,15 @@ public class K8sSandboxClient {
@Value("${k8s.jupyter-image:jupyter/datascience-notebook:latest}")
private String jupyterImage;
+ /** [V1.5] TEE 模式专用镜像(被 kata 机密容器使用,含 compute.py + CDH + KBS 链路) */
@Value("${k8s.tee-image:python:3.11-slim}")
private String teeImage;
+ /** [V1.5] 默认模式(NAX / BOTH)专用镜像——TDC Nax sidecar,含 nax 包 + nax_adapter.py
+ * (详见 boot/docker/ssw-nax-runtime/Dockerfile) */
+ @Value("${k8s.nax-image:ssw-nax-runtime:latest}")
+ private String naxImage;
+
@Value("${k8s.kubeconfig:}")
private String kubeconfig;
@@ -328,8 +334,53 @@ public class K8sSandboxClient {
}
}
+ // ----------------------------------------------------------------- Nax 运行时(V1.5 默认 runtime)
+
/**
- * 从 Job 的 pod 日志里取出 compute.py 打的结果载荷。
+ * 提交一次 Nax 运行时 Job(默认模式:NAX / BOTH connector)。
+ *
+ * 与 {@link #runTeeJob} 的关键差异:
+ *
+ * - 镜像用 {@code naxImage}(TDC Nax sidecar,{@code boot/docker/ssw-nax-runtime}),
+ * 入口是 {@code nax_adapter.py}(stdin/stdout JSON 协议);
+ * - runtimeClass 留空,走集群默认 runtime(不要求 kata / SEV-SNP);
+ * - 不走 KBS / CDH 链路(kbsEngaged=false),pod 直接以环境变量 / stdin 喂算子 JSON。
+ *
+ *
+ * V1.5.2 dev 起步:仅做"镜像切换 + runtime 切换"骨架;stdin 喂数据协议留 V1.5.6 跨方 Nax 协议补。
+ * 当前实现:起 pod 立刻退出(nax_adapter.py 收到无效 stdin 报错退出),返回 SUCCESS 占位——只验证镜像可拉起 + runtime 选对。
+ *
+ * 详见 {@code docs/tds/SSWFLOW_BINDING.md §11 V1.5.2}。
+ *
+ * @param taskId 算子 ID
+ * @param operatorJson nax_adapter.py 要吃的算子 JSON(dev 起步先用环境变量,未来切 stdin)
+ */
+ public K8sResult runNaxJob(String taskId, String operatorJson) {
+ if (!enabled) return null;
+ final String k8sId = sanitizeTaskId(taskId);
+ try {
+ Map sub = new LinkedHashMap<>();
+ sub.put("TASK_ID", k8sId);
+ sub.put("NAMESPACE", namespace);
+ sub.put("RUNTIME_CLASS", ""); // 集群默认 runtime
+ sub.put("IMAGE", naxImage);
+ sub.put("OPERATOR_JSON", operatorJson == null ? "{}" : operatorJson);
+ File tf = render("k8s/tee-job.yaml", sub);
+ int code = kubectl("apply", "-f", tf.getAbsolutePath());
+ log.info("[K8S] Nax Job 提交 taskId={} image={} runtime=default kubectl exit={}",
+ taskId, naxImage, code);
+ K8sResult r = new K8sResult();
+ r.status = code == 0 ? "SUCCESS" : "FAIL";
+ r.resultUri = null;
+ r.runLog = "[V1.5.2 dev] Nax Job 镜像切换骨架已就绪,跨方协议留 V1.5.6";
+ return r;
+ } catch (Exception e) {
+ log.warn("[K8S] Nax Job 失败(回退) taskId={}", taskId, e);
+ return null;
+ }
+ }
+
+ /** 从 Job 的 pod 日志里取出 compute.py 打的结果载荷。
* 载荷被包在 {@code SSW_TEE_RESULT_BEGIN} / {@code SSW_TEE_RESULT_END} 之间,
* 前后还有 {@code [TEE] ...} 进度行,这里只取中间那段 JSON。
*/
diff --git a/boot/ssw-tdc/ssw-tdc-controller/pom.xml b/boot/ssw-tdc/ssw-tdc-controller/pom.xml
index c3840da..78f2cd0 100644
--- a/boot/ssw-tdc/ssw-tdc-controller/pom.xml
+++ b/boot/ssw-tdc/ssw-tdc-controller/pom.xml
@@ -17,11 +17,6 @@
ssw-tdc-biz
${project.version}
-
- com.jnpf
- ssw-tds-biz
- ${project.version}
-
com.jnpf
jnpf-common-all
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/audit/AuditAction.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/audit/AuditAction.java
new file mode 100644
index 0000000..b348fc3
--- /dev/null
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/audit/AuditAction.java
@@ -0,0 +1,50 @@
+package ssw.tdc.audit;
+
+/**
+ * 审计动作常量 —— 统一口径,避免各处自由发挥导致日志无法聚合分析。
+ *
+ * 可信数据空间关注的六类关键行为,对应国标里「合规 / 授权 / 控制 / 安全 / 分配 / 存证」。
+ * 从 {@code ssw.tds.audit.AuditAction} 下沉到 TDC 本地:TDC 节点是独立部署(不依赖 TDS 模块),
+ * 审计动作常量属于跨系统通用词汇,放 TDC 本地避免引入 ssw.tds 编译依赖。
+ *
+ * @author SSW-TDC
+ */
+public final class AuditAction {
+
+ private AuditAction() {
+ }
+
+ // ---------------------------------------------------------------- 录入
+ public static final String CREATE = "CREATE";
+ public static final String UPDATE = "UPDATE";
+ public static final String DELETE = "DELETE";
+
+ // ---------------------------------------------------------------- 审核
+ public static final String SUBMIT_AUDIT = "SUBMIT_AUDIT";
+ public static final String APPROVE = "APPROVE";
+ public static final String REJECT = "REJECT";
+
+ // ---------------------------------------------------------------- 授权
+ public static final String GRANT = "GRANT";
+ public static final String REVOKE = "REVOKE";
+ public static final String SIGN = "SIGN";
+
+ // ---------------------------------------------------------------- 控制
+ public static final String POLICY_CHECK = "POLICY_CHECK";
+ public static final String POLICY_DENY = "POLICY_DENY";
+
+ // ---------------------------------------------------------------- 执行
+ public static final String EXECUTE = "EXECUTE";
+ public static final String CALL = "CALL";
+ public static final String PUBLISH = "PUBLISH";
+ public static final String OFFLINE = "OFFLINE";
+
+ // ---------------------------------------------------------------- 结算
+ public static final String SETTLE = "SETTLE";
+
+ // ---------------------------------------------------------------- 销毁
+ public static final String DESTROY = "DESTROY";
+
+ // ---------------------------------------------------------------- 存证
+ public static final String CHAIN_WRITE = "CHAIN_WRITE";
+}
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/HttpTdcTdsClient.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/HttpTdcTdsClient.java
new file mode 100644
index 0000000..105419e
--- /dev/null
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/HttpTdcTdsClient.java
@@ -0,0 +1,138 @@
+package ssw.tdc.client;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link TdcTdsClient} 的 HTTP 实现:配置了 {@code ssw.tds.base-url} 时生效。
+ *
+ *
通过内部端点调运营方 TDS(与 {@link TdcSswflowClient} 同一信任模型:App-Code=tdc +
+ * X-Internal-Token,端点走 exclude-url 绕过 JNPF AuthFilter)。所有调用失败即降级,
+ * 不让跨系统故障拖垮 TDC 本地业务。
+ *
+ *
依赖的 TDS 侧端点(运营方 {@code ssw-tds-controller} 需暴露,见 SSWFLOW_BINDING §TDC 跨系统读):
+ *
+ * GET /api/ssw/tds/Bridge/Contract/{id} -> 合约概览 Map
+ * GET /api/ssw/tds/Bridge/Connector/{id} -> 连接器概览 Map
+ * GET /api/ssw/tds/Bridge/DataProduct/{id} -> 数据产品概览 Map
+ * POST /api/ssw/tds/Bridge/AuditChain body: {bizIds:[..]} -> 审计哈希链 Map
+ * POST /api/ssw/tds/Bridge/ChainEvidence body: {bizIds:[..]} -> 链上存证 Map
+ * POST /api/ssw/tds/Bridge/AuditRecord body: {bizIds:[..]} -> 审计记录 Map
+ * POST /api/ssw/tds/Bridge/AuditTrail body: 留痕 JSON -> void
+ *
+ *
+ * @author SSW-TDC
+ */
+@Slf4j
+public class HttpTdcTdsClient implements TdcTdsClient {
+
+ private final RestTemplate rest = new RestTemplate();
+ private final ObjectMapper mapper = new ObjectMapper();
+ private final String baseUrl;
+ private final String internalToken;
+
+ public HttpTdcTdsClient(String baseUrl, String internalToken) {
+ this.baseUrl = baseUrl;
+ this.internalToken = internalToken == null ? "" : internalToken;
+ }
+
+ private HttpHeaders headers() {
+ HttpHeaders h = new HttpHeaders();
+ h.setContentType(MediaType.APPLICATION_JSON);
+ if (internalToken != null && !internalToken.isBlank()) {
+ h.set("X-Internal-Token", internalToken);
+ }
+ return h;
+ }
+
+ private String url(String path) {
+ return baseUrl.replaceAll("/+$", "") + path;
+ }
+
+ @Override
+ public Map getContract(String contractId) {
+ return get("/api/ssw/tds/Bridge/Contract/" + contractId, Map.class);
+ }
+
+ @Override
+ public Map getConnector(String connectorId) {
+ return get("/api/ssw/tds/Bridge/Connector/" + connectorId, Map.class);
+ }
+
+ @Override
+ public Map getProduct(String productId) {
+ return get("/api/ssw/tds/Bridge/DataProduct/" + productId, Map.class);
+ }
+
+ @Override
+ public Map getAuditChain(Collection bizIds) {
+ return post("/api/ssw/tds/Bridge/AuditChain", bizIds, Map.class);
+ }
+
+ @Override
+ public Map getChainEvidences(Collection bizIds) {
+ return post("/api/ssw/tds/Bridge/ChainEvidence", bizIds, Map.class);
+ }
+
+ @Override
+ public Map getAuditRecords(Collection bizIds) {
+ return post("/api/ssw/tds/Bridge/AuditRecord", bizIds, Map.class);
+ }
+
+ @Override
+ public void recordAudit(String bizType, String bizId, String action, String target) {
+ recordAudit(bizType, bizId, action, target, null, null, null);
+ }
+
+ @Override
+ public void recordAudit(String bizType, String bizId, String action, String target,
+ String result, String failReason, String detail) {
+ try {
+ Map body = new java.util.LinkedHashMap<>(8);
+ body.put("bizType", bizType);
+ body.put("bizId", bizId);
+ body.put("action", action);
+ body.put("target", target);
+ body.put("result", result);
+ body.put("failReason", failReason);
+ body.put("detail", detail);
+ rest.postForEntity(url("/api/ssw/tds/Bridge/AuditTrail"),
+ new HttpEntity<>(body, headers()), Void.class);
+ } catch (RestClientException e) {
+ log.warn("[TDC-AUDIT] 留痕上报 TDS 失败(降级忽略) bizType={} bizId={} action={} err={}",
+ bizType, bizId, action, e.getMessage());
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private T get(String path, Class type) {
+ try {
+ return rest.getForObject(url(path), type);
+ } catch (RestClientException e) {
+ log.warn("[TDC-TDS] GET {} 失败(降级返回空) err={}", path, e.getMessage());
+ return null;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private T post(String path, Object body, Class type) {
+ try {
+ String json = mapper.writeValueAsString(java.util.Collections.singletonMap("bizIds", body));
+ return rest.postForObject(url(path), new HttpEntity<>(json, headers()), type);
+ } catch (RestClientException | com.fasterxml.jackson.core.JsonProcessingException e) {
+ log.warn("[TDC-TDS] POST {} 失败(降级返回空) err={}", path, e.getMessage());
+ return null;
+ }
+ }
+}
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/NoopTdcTdsClient.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/NoopTdcTdsClient.java
new file mode 100644
index 0000000..2a2ae21
--- /dev/null
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/NoopTdcTdsClient.java
@@ -0,0 +1,61 @@
+package ssw.tdc.client;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link TdcTdsClient} 的默认实现:未配置 {@code ssw.tds.base-url} 时生效。
+ *
+ * 纯 TDC 节点不连运营方 TDS,所有跨系统读取返回 null/空、写入静默丢弃,
+ * 业务全景只展示 TDC 本地数据。这是「tdc 包不依赖 tds」在运行期的优雅降级形态。
+ *
+ * @author SSW-TDC
+ */
+@Slf4j
+public class NoopTdcTdsClient implements TdcTdsClient {
+
+ @Override
+ public Map getContract(String contractId) {
+ return null;
+ }
+
+ @Override
+ public Map getConnector(String connectorId) {
+ return null;
+ }
+
+ @Override
+ public Map getProduct(String productId) {
+ return null;
+ }
+
+ @Override
+ public Map getAuditChain(Collection bizIds) {
+ return Collections.emptyMap();
+ }
+
+ @Override
+ public Map getChainEvidences(Collection bizIds) {
+ return Collections.emptyMap();
+ }
+
+ @Override
+ public Map getAuditRecords(Collection bizIds) {
+ return Collections.emptyMap();
+ }
+
+ @Override
+ public void recordAudit(String bizType, String bizId, String action, String target) {
+ log.debug("[TDC-AUDIT-noop] {} {} {} {}", bizType, bizId, action, target);
+ }
+
+ @Override
+ public void recordAudit(String bizType, String bizId, String action, String target,
+ String result, String failReason, String detail) {
+ log.debug("[TDC-AUDIT-noop] {} {} {} {} {} | {}", bizType, bizId, action, target, result, detail);
+ }
+}
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/TdcTdsClient.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/TdcTdsClient.java
new file mode 100644
index 0000000..a060d70
--- /dev/null
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/TdcTdsClient.java
@@ -0,0 +1,57 @@
+package ssw.tdc.client;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TDC 与运营方 TDS 的跨系统读/写客户端。
+ *
+ * 为什么需要它
+ * TDC 节点是独立部署的数据持有方(不依赖 TDS 模块、不连 TDS 库)。
+ * 但「业务全景 / 信任一屏」需要聚合运营方 TDS 侧的数据(上游合约、连接器、数据产品、
+ * 哈希链审计留痕、链上存证),且 TDC 自身的操作留痕要汇聚到运营方中枢。
+ * 这些跨系统交互统一走本客户端,绝不在 TDC 包里直接 import ssw.tds.*。
+ *
+ * 两种实现
+ *
+ * - {@link NoopTdcTdsClient}:默认实现(未配置 {@code ssw.tds.base-url} 时生效),
+ * 所有读取返回 null/空、写入静默丢弃 —— 纯 TDC 节点不连 TDS 时优雅降级,
+ * 业务全景只显示 TDC 本地数据。
+ * - {@link HttpTdcTdsClient}:配置了 {@code ssw.tds.base-url} 时生效,
+ * 通过 mTLS/内部 Token 调运营方 TDS 暴露的只读/留痕端点。
+ *
+ *
+ * 约定
+ * 读取方法返回已按前端字段名裁剪好的 Map(键名与历史上 TDC 从 TDS Entity getter
+ * 拼出的字段一致),调用方拿到后直接 {@code data.put(key, map)} 即可,无需逐字段转译。
+ *
+ * @author SSW-TDC
+ */
+public interface TdcTdsClient {
+
+ /** 上游合约概览(含双签人/连接器名称等,运营方 TDS 侧聚合好返回) */
+ Map getContract(String contractId);
+
+ /** 连接器概览(id/name/connectorCode/status/orgName) */
+ Map getConnector(String connectorId);
+
+ /** 数据产品概览(含 providerConnectorId 等) */
+ Map getProduct(String productId);
+
+ /** 可信审计哈希链(含逐条 hashValid/linked/chainIntact 校验) */
+ Map getAuditChain(Collection bizIds);
+
+ /** 链上存证(含 status/verifyResult 等,能区分成功/失败/待确认) */
+ Map getChainEvidences(Collection bizIds);
+
+ /** 授权/策略/审核记录(业务全景「授权」区块) */
+ Map getAuditRecords(Collection bizIds);
+
+ /** 写一条业务留痕(TDC 操作痕迹汇聚到运营方中枢) */
+ void recordAudit(String bizType, String bizId, String action, String target);
+
+ /** 写一条带结果与明细的业务留痕 */
+ void recordAudit(String bizType, String bizId, String action, String target,
+ String result, String failReason, String detail);
+}
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/TdcTdsClientConfig.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/TdcTdsClientConfig.java
new file mode 100644
index 0000000..12b0ba8
--- /dev/null
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/client/TdcTdsClientConfig.java
@@ -0,0 +1,35 @@
+package ssw.tdc.client;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * {@link TdcTdsClient} 的 Bean 装配(TDC↔TDS 解耦核心)。
+ *
+ * 规则:配置了 {@code ssw.tds.base-url} 才注册 {@link HttpTdcTdsClient}(走 HTTP 调运营方 TDS);
+ * 否则注册 {@link NoopTdcTdsClient}(纯 TDC 节点优雅降级)。两者互斥、保证恰好一个 Bean,
+ * 避免类级 {@code @ConditionalOnMissingBean} 无法推断类型的坑(会导致 Noop 永不被实例化)。
+ *
+ *
这是「tdc 包不依赖 tds」运行期落地的关键:TDC 的 Controller 永远只依赖 {@code TdcTdsClient}
+ * 接口,具体实现由本配置按部署角色注入。
+ */
+@Configuration
+public class TdcTdsClientConfig {
+
+ @Bean
+ @ConditionalOnProperty(prefix = "ssw.tds", name = "base-url")
+ public TdcTdsClient httpTdcTdsClient(
+ @Value("${ssw.tds.base-url}") String baseUrl,
+ @Value("${ssw.tds.internal-token:}") String internalToken) {
+ return new HttpTdcTdsClient(baseUrl, internalToken);
+ }
+
+ @Bean
+ @ConditionalOnMissingBean(TdcTdsClient.class)
+ public TdcTdsClient noopTdcTdsClient() {
+ return new NoopTdcTdsClient();
+ }
+}
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DeliveryTaskController.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DeliveryTaskController.java
index d174330..5027591 100644
--- a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DeliveryTaskController.java
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DeliveryTaskController.java
@@ -24,11 +24,8 @@ import ssw.tdc.notify.NotifyDispatcher;
import ssw.tdc.entity.ApiConsumeLogEntity;
import ssw.tdc.entity.OrderEntity;
import ssw.tdc.service.OrderService;
-import ssw.tds.entity.ChainEvidenceEntity;
-import ssw.tds.entity.ContractEntity;
-import ssw.tds.service.ChainEvidenceService;
-import ssw.tds.service.ContractService;
-// 注:合约存证是 tds 库,跨 schema 用 ssw.tds.* 防止 @DS("tdc") 路由把查询打回 tdc 库(会查不到)
+import ssw.tdc.audit.AuditAction;
+import ssw.tdc.client.TdcTdsClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.Date;
@@ -37,11 +34,6 @@ import java.util.Map;
import java.util.ArrayList;
import java.util.List;
import ssw.common.permission.UserNameResolver;
-import ssw.tds.entity.AuditLogEntity;
-import ssw.tds.entity.ConnectorEntity;
-import ssw.tds.service.AuditLogService;
-import ssw.tds.service.ConnectorService;
-import ssw.tds.service.DataProductService;
/**
* 数据交付任务控制器
@@ -74,20 +66,12 @@ public class DeliveryTaskController extends TdcCrudController CANCELLED");
return ActionResult.success("任务已取消", id);
}
@@ -388,7 +372,7 @@ public class DeliveryTaskController extends TdcCrudController PENDING/PENDING_DELIVER;审核态由 "
+ (exists.getAuditStatus() == null ? "NONE" : exists.getAuditStatus())
@@ -414,11 +398,11 @@ public class DeliveryTaskController extends TdcCrudController contract = tdcTdsClient.getContract(task.getContractId());
if (contract != null) {
- Map contractMap = new LinkedHashMap<>();
- contractMap.put("contractCode", contract.getContractCode());
- contractMap.put("name", contract.getName());
- contractMap.put("providerConnectorId", contract.getProviderConnectorId());
- contractMap.put("providerOrgId", contract.getProviderOrgId());
- contractMap.put("providerOrgName", contract.getProviderOrgName());
- contractMap.put("consumerConnectorId", contract.getConsumerConnectorId());
- contractMap.put("consumerOrgId", contract.getConsumerOrgId());
- contractMap.put("consumerOrgName", contract.getConsumerOrgName());
- contractMap.put("purpose", contract.getPurpose());
- contractMap.put("deliveryType", contract.getDeliveryType());
- contractMap.put("priceMode", contract.getPriceMode());
- contractMap.put("amount", contract.getAmount());
- contractMap.put("quotaTotal", contract.getQuotaTotal());
- contractMap.put("quotaUsed", contract.getQuotaUsed());
- contractMap.put("effectiveTime", contract.getEffectiveTime());
- contractMap.put("expireTime", contract.getExpireTime());
- contractMap.put("providerSignature", contract.getProviderSignature());
- contractMap.put("providerSignTime", contract.getProviderSignTime());
- contractMap.put("consumerSignature", contract.getConsumerSignature());
- contractMap.put("consumerSignTime", contract.getConsumerSignTime());
- contractMap.put("signTime", contract.getSignTime());
- contractMap.put("signCostMs", contract.getSignCostMs());
- contractMap.put("status", contract.getStatus());
- contractMap.put("contentHash", contract.getContentHash());
- contractMap.put("chainTxHash", contract.getChainTxHash());
- contractMap.put("chainBlockNo", contract.getChainBlockNo());
- contractMap.put("chainTime", contract.getChainTime());
- contractMap.put("policyContent", contract.getPolicyContent());
- // 供方/使用方连接器名称解析(「供方经连接器接入数据」在全景可见)
- if (connectorService != null) {
- if (contract.getProviderConnectorId() != null) {
- ConnectorEntity pc = safeGet(connectorService, contract.getProviderConnectorId());
- if (pc != null) {
- contractMap.put("providerConnectorName", pc.getName());
- contractMap.put("providerConnectorCode", pc.getConnectorCode());
- contractMap.put("providerConnectorOnline", "ONLINE".equals(pc.getStatus()));
- }
- }
- if (contract.getConsumerConnectorId() != null) {
- ConnectorEntity cc = safeGet(connectorService, contract.getConsumerConnectorId());
- if (cc != null) {
- contractMap.put("consumerConnectorName", cc.getName());
- contractMap.put("consumerConnectorCode", cc.getConnectorCode());
- contractMap.put("consumerConnectorOnline", "ONLINE".equals(cc.getStatus()));
- }
- }
- }
- data.put("contract", contractMap);
+ data.put("contract", contract);
}
}
// 4. 参与方(从 task 已有 consumerOrg 字段 + 用 connectorService 反查 provider 提供方)
@@ -637,18 +573,19 @@ public class DeliveryTaskController extends TdcCrudController contract = tdcTdsClient.getContract(task.getContractId());
+ if (contract != null && contract.get("quotaTotal") != null) {
Map quota = new LinkedHashMap<>();
- quota.put("total", contract.getQuotaTotal());
- quota.put("used", contract.getQuotaUsed());
- if (contract.getQuotaTotal() != null && contract.getQuotaTotal() > 0) {
- long used = contract.getQuotaUsed() == null ? 0 : contract.getQuotaUsed();
- quota.put("remaining", contract.getQuotaTotal() - used);
- quota.put("usagePercent",
- Math.round(10000.0 * used / contract.getQuotaTotal()) / 100.0);
+ long total = ((Number) contract.get("quotaTotal")).longValue();
+ long used = contract.get("quotaUsed") == null ? 0
+ : ((Number) contract.get("quotaUsed")).longValue();
+ quota.put("total", total);
+ quota.put("used", used);
+ if (total > 0) {
+ quota.put("remaining", total - used);
+ quota.put("usagePercent", Math.round(10000.0 * used / total) / 100.0);
}
data.put("quota", quota);
}
@@ -690,16 +627,16 @@ public class DeliveryTaskController extends TdcCrudController chainEvidences = tdcTdsClient.getChainEvidences(evidenceBizIds);
+ if (chainEvidences != null) {
+ data.put("chainEvidences", chainEvidences);
}
- // ---------------- 可信证据链(统一口径) ----------------
- // 审计留痕由 EvidenceAssembler 统一组装:返回 seqNo/prevHash/hash 三件套
+ // ---------------- 可信证据链(统一口径,跨系统自运营方 TDS 拉取) ----------------
+ // 审计留痕由运营方 TDS 的 EvidenceAssembler 统一组装:返回 seqNo/prevHash/hash 三件套
// 以及逐条重算得出的 hashValid/linked,前端才能标"已验证"而不是干印一串哈希。
- // 7 个业务全景页共用这一份实现,杜绝各写一遍、各丢一批字段。
- if (evidenceAssembler != null) {
- Map chain = evidenceAssembler.auditChain(evidenceBizIds);
+ Map chain = tdcTdsClient.getAuditChain(evidenceBizIds);
+ if (chain != null) {
data.put("auditChain", chain);
// auditLog 保留为兼容字段,内容是 auditChain.items(字段为旧结构的超集)
data.put("auditLog", chain.get("items"));
@@ -727,8 +664,9 @@ public class DeliveryTaskController extends TdcCrudController auditRecords = tdcTdsClient.getAuditRecords(authBizIds);
+ if (auditRecords != null) {
+ data.put("auditRecords", auditRecords);
}
return ActionResult.success(data);
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DemandController.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DemandController.java
index fafafa0..7a03085 100644
--- a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DemandController.java
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/DemandController.java
@@ -19,6 +19,8 @@ import ssw.tdc.entity.DemandEntity;
import ssw.tdc.entity.OrderEntity;
import ssw.tdc.service.DemandService;
import ssw.tdc.service.OrderService;
+import ssw.tdc.audit.AuditAction;
+import ssw.tdc.client.TdcTdsClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.Date;
@@ -42,14 +44,10 @@ public class DemandController extends TdcCrudController {
private DemandService demandService;
@Autowired
private OrderService orderService;
- @Autowired(required = false) private ssw.tds.service.AuditLogService auditLogService;
+ @Autowired private TdcTdsClient tdcTdsClient;
@Autowired(required = false) private ssw.common.permission.UserNameResolver userNameResolver;
@Autowired(required = false)
- private ssw.tds.audit.EvidenceAssembler evidenceAssembler;
- @Autowired(required = false)
private ssw.tdc.audit.TrustLinkAssembler trustLinkAssembler;
- @Autowired(required = false)
- private ssw.tds.audit.AuditRecordAssembler auditRecordAssembler;
@Override
protected SuperService service() { return demandService; }
@@ -89,7 +87,7 @@ public class DemandController extends TdcCrudController {
d.setPublishUserId(UserProvider.getLoginUserId());
boolean ok = demandService.updateById(d);
if (ok) {
- audit(ssw.tds.audit.AuditAction.PUBLISH, id, d.getDemandCode(), "SUCCESS", null,
+ audit(AuditAction.PUBLISH, id, d.getDemandCode(), "SUCCESS", null,
"需求发布到需求广场:DRAFT -> PUBLISHED;标题=" + d.getTitle()
+ ";提出方=" + (d.getMemberName() == null ? d.getMemberId() : d.getMemberName()));
}
@@ -108,7 +106,7 @@ public class DemandController extends TdcCrudController {
d.setStatus("CLOSED");
boolean ok = demandService.updateById(d);
if (ok) {
- audit(ssw.tds.audit.AuditAction.OFFLINE, id, d.getDemandCode(), "SUCCESS", null,
+ audit(AuditAction.OFFLINE, id, d.getDemandCode(), "SUCCESS", null,
"需求关闭:" + from + " -> CLOSED;不再接受新的响应");
}
return ok ? ActionResult.success("已关闭", d.getId()) : ActionResult.fail("操作失败");
@@ -158,7 +156,7 @@ public class DemandController extends TdcCrudController {
boolean ok = orderService.save(o);
if (ok) {
// 撮合成交是供需双方建立关系的起点,买卖双方是谁、走什么交付方式,必须锁死在链上
- audit(ssw.tds.audit.AuditAction.CREATE, id, d.getDemandCode(), "SUCCESS", null,
+ audit(AuditAction.CREATE, id, d.getDemandCode(), "SUCCESS", null,
"需求撮合响应:生成订单 " + o.getOrderCode() + "(" + o.getId() + ")"
+ ";买方(需求方)=" + buyerName + "(" + buyerId + ")"
+ ";卖方(响应方)=" + responderId
@@ -224,12 +222,12 @@ public class DemandController extends TdcCrudController {
java.util.List evidenceBizIds = new java.util.ArrayList<>();
evidenceBizIds.add(demand.getId());
if (demand.getDemandCode() != null) evidenceBizIds.add(demand.getDemandCode());
- // ---------------- 可信证据链(统一口径) ----------------
- // 审计留痕由 EvidenceAssembler 统一组装:返回 seqNo/prevHash/hash 三件套
+ // ---------------- 可信证据链(统一口径,跨系统自运营方 TDS 拉取) ----------------
+ // 审计留痕由运营方 TDS 的 EvidenceAssembler 统一组装:返回 seqNo/prevHash/hash 三件套
// 以及逐条重算得出的 hashValid/linked,前端才能标"已验证"而不是干印一串哈希。
// 7 个业务全景页共用这一份实现,杜绝各写一遍、各丢一批字段。
- if (evidenceAssembler != null) {
- Map chain = evidenceAssembler.auditChain(evidenceBizIds);
+ Map chain = tdcTdsClient.getAuditChain(evidenceBizIds);
+ if (chain != null) {
data.put("auditChain", chain);
// auditLog 保留为兼容字段,内容是 auditChain.items(字段为旧结构的超集)
data.put("auditLog", chain.get("items"));
@@ -252,8 +250,9 @@ public class DemandController extends TdcCrudController {
data.put("authorizations", trustLinkAssembler.authorizations(java.util.Collections.emptyList()));
data.put("policyChecks", trustLinkAssembler.policyChecks(authBizIds));
}
- if (auditRecordAssembler != null) {
- data.put("auditRecords", auditRecordAssembler.auditRecords(authBizIds));
+ Map auditRecords = tdcTdsClient.getAuditRecords(authBizIds);
+ if (auditRecords != null) {
+ data.put("auditRecords", auditRecords);
}
return ActionResult.success(data);
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/OrderController.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/OrderController.java
index 6f26cd4..74ae527 100644
--- a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/OrderController.java
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/OrderController.java
@@ -24,8 +24,8 @@ import ssw.tdc.service.OrderService;
import ssw.tdc.service.ProductService;
import ssw.tdc.entity.DemandEntity;
import ssw.tdc.service.DemandService;
-import ssw.tds.entity.ContractEntity;
-import ssw.tds.service.ContractService;
+import ssw.tdc.audit.AuditAction;
+import ssw.tdc.client.TdcTdsClient;
import java.util.Date;
import java.util.LinkedHashMap;
@@ -33,12 +33,6 @@ import java.util.Map;
import java.util.ArrayList;
import java.util.List;
import ssw.common.permission.UserNameResolver;
-import ssw.tds.entity.AuditLogEntity;
-import ssw.tds.entity.ConnectorEntity;
-import ssw.tds.entity.DataProductEntity;
-import ssw.tds.service.AuditLogService;
-import ssw.tds.service.ConnectorService;
-import ssw.tds.service.DataProductService;
/**
* 订单控制器(V0.12 B1:TC_OP_005 ~ TC_OP_010)
@@ -82,17 +76,10 @@ public class OrderController extends TdcCrudController {
@Autowired
private DeliveryTaskService deliveryTaskService;
@Autowired private DemandService demandService;
- @Autowired private ssw.tds.service.ContractService contractService;
- @Autowired(required = false) private ssw.tds.service.DataProductService dataProductService;
- @Autowired(required = false) private ssw.tds.service.ConnectorService connectorService;
- @Autowired(required = false) private ssw.tds.service.AuditLogService auditLogService;
+ @Autowired private TdcTdsClient tdcTdsClient;
@Autowired(required = false) private ssw.common.permission.UserNameResolver userNameResolver;
@Autowired(required = false)
- private ssw.tds.audit.EvidenceAssembler evidenceAssembler;
- @Autowired(required = false)
private ssw.tdc.audit.TrustLinkAssembler trustLinkAssembler;
- @Autowired(required = false)
- private ssw.tds.audit.AuditRecordAssembler auditRecordAssembler;
@Override
protected SuperService service() {
@@ -389,26 +376,13 @@ public class OrderController extends TdcCrudController {
}
}
- // 5. 上游合约(跨 schema: tds)
+ // 5. 上游合约(跨系统:运营方 TDS 持有,经 TdcTdsClient 拉取)
if (order.getDeliveryTaskId() != null && !order.getDeliveryTaskId().isBlank()) {
DeliveryTaskEntity dt = safeGet(deliveryTaskService, order.getDeliveryTaskId());
if (dt != null && dt.getContractId() != null && !dt.getContractId().isBlank()) {
- ContractEntity contract = safeGet(contractService, dt.getContractId());
+ Map contract = tdcTdsClient.getContract(dt.getContractId());
if (contract != null) {
- Map c = new LinkedHashMap<>();
- c.put("contractCode", contract.getContractCode());
- c.put("name", contract.getName());
- c.put("providerOrgName", contract.getProviderOrgName());
- c.put("consumerOrgName", contract.getConsumerOrgName());
- c.put("purpose", contract.getPurpose());
- c.put("priceMode", contract.getPriceMode());
- c.put("amount", contract.getAmount());
- c.put("quotaTotal", contract.getQuotaTotal());
- c.put("quotaUsed", contract.getQuotaUsed());
- c.put("status", contract.getStatus());
- c.put("chainTxHash", contract.getChainTxHash());
- c.put("chainBlockNo", contract.getChainBlockNo());
- data.put("contract", c);
+ data.put("contract", contract);
}
}
}
@@ -422,20 +396,15 @@ public class OrderController extends TdcCrudController {
data.put("parties", parties);
// 7. 供方连接器(order -> product -> provider connector),让「供方经连接器接入数据」在全景可见
+ // product / connector 均由运营方 TDS 持有,经 TdcTdsClient 拉取
try {
- if (order.getProductId() != null && dataProductService != null) {
- DataProductEntity prod = safeGet(dataProductService, order.getProductId());
- if (prod != null && prod.getProviderConnectorId() != null && connectorService != null) {
- ConnectorEntity prov = safeGet(connectorService, prod.getProviderConnectorId());
+ if (order.getProductId() != null) {
+ Map prod = tdcTdsClient.getProduct(order.getProductId());
+ if (prod != null && prod.get("providerConnectorId") != null) {
+ Map prov = tdcTdsClient.getConnector(
+ String.valueOf(prod.get("providerConnectorId")));
if (prov != null) {
- Map pc = new LinkedHashMap<>();
- pc.put("id", prov.getId());
- pc.put("name", prov.getName());
- pc.put("connectorCode", prov.getConnectorCode());
- pc.put("status", prov.getStatus());
- pc.put("online", "ONLINE".equals(prov.getStatus()));
- pc.put("orgName", prov.getOrgName());
- data.put("providerConnector", pc);
+ data.put("providerConnector", prov);
}
}
}
@@ -444,12 +413,12 @@ public class OrderController extends TdcCrudController {
java.util.List evidenceBizIds = new java.util.ArrayList<>();
evidenceBizIds.add(order.getId());
if (order.getOrderCode() != null) evidenceBizIds.add(order.getOrderCode());
- // ---------------- 可信证据链(统一口径) ----------------
- // 审计留痕由 EvidenceAssembler 统一组装:返回 seqNo/prevHash/hash 三件套
+ // ---------------- 可信证据链(统一口径,跨系统自运营方 TDS 拉取) ----------------
+ // 审计留痕由运营方 TDS 的 EvidenceAssembler 统一组装:返回 seqNo/prevHash/hash 三件套
// 以及逐条重算得出的 hashValid/linked,前端才能标"已验证"而不是干印一串哈希。
// 7 个业务全景页共用这一份实现,杜绝各写一遍、各丢一批字段。
- if (evidenceAssembler != null) {
- Map chain = evidenceAssembler.auditChain(evidenceBizIds);
+ Map chain = tdcTdsClient.getAuditChain(evidenceBizIds);
+ if (chain != null) {
data.put("auditChain", chain);
// auditLog 保留为兼容字段,内容是 auditChain.items(字段为旧结构的超集)
data.put("auditLog", chain.get("items"));
@@ -475,8 +444,9 @@ public class OrderController extends TdcCrudController {
data.put("authorizations", trustLinkAssembler.authorizations(productIds));
data.put("policyChecks", trustLinkAssembler.policyChecks(authBizIds));
}
- if (auditRecordAssembler != null) {
- data.put("auditRecords", auditRecordAssembler.auditRecords(authBizIds));
+ Map auditRecords = tdcTdsClient.getAuditRecords(authBizIds);
+ if (auditRecords != null) {
+ data.put("auditRecords", auditRecords);
}
return ActionResult.success(data);
diff --git a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/ProductApiGatewayController.java b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/ProductApiGatewayController.java
index bc4700f..b4b1d91 100644
--- a/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/ProductApiGatewayController.java
+++ b/boot/ssw-tdc/ssw-tdc-controller/src/main/java/ssw/tdc/controller/ProductApiGatewayController.java
@@ -16,8 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import jakarta.servlet.http.HttpServletRequest;
import ssw.tdc.entity.ApiConsumeLogEntity;
import ssw.tdc.service.ApiConsumeLogService;
-import ssw.tds.entity.DataProductEntity;
-import ssw.tds.service.DataProductService;
+import ssw.tdc.client.TdcTdsClient;
import java.util.ArrayList;
import java.util.Date;
@@ -41,7 +40,7 @@ import java.util.Map;
public class ProductApiGatewayController {
@Autowired
- private DataProductService productService;
+ private TdcTdsClient tdcTdsClient;
@Autowired
private ApiConsumeLogService apiConsumeLogService;
@@ -58,18 +57,18 @@ public class ProductApiGatewayController {
return ActionResult.fail("产品标识不能为空");
}
- DataProductEntity product = productService.getById(productId);
+ Map product = tdcTdsClient.getProduct(productId);
// TC-PRODUCT_API-018:不存在的产品被拒
if (product == null) {
return ActionResult.fail("数据产品不存在");
}
// TC-PRODUCT_API-018:未上架(OFFLINE / DRAFT)产品不可用
- if (!"ONLINE".equals(product.getStatus())) {
+ if (!"ONLINE".equals(String.valueOf(product.get("status")))) {
return ActionResult.fail("产品未上架,暂不可用");
}
// 落一条 SUCCESS 消费留痕(TC-PRODUCT_API-017 / SECURITY-006 校验日志增长)
- writeLog(product, request, "SUCCESS", null);
+ writeLog(productId, request, "SUCCESS", null);
// 返回骨架数据(真实数据集由数据资源 → 业务库接入后产出)
List
+
+
+ com.jnpf
+ ssw-tdc-entity
+ ${project.version}
+
com.jnpf
jnpf-common-all
diff --git a/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/CertController.java b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/CertController.java
index 7ff7fdc..64bd234 100644
--- a/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/CertController.java
+++ b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/CertController.java
@@ -35,9 +35,15 @@ public class CertController {
if (status != null && !status.isEmpty()) qw.eq("f_status", status);
if (kind != null && !kind.isEmpty()) qw.eq("f_kind", kind);
qw.apply("(f_delete_mark IS NULL OR f_delete_mark = 0)");
- qw.orderByDesc("f_creator_time");
+ // [FIX] count 必须在加 ORDER BY 之前:MP 的 count(wrapper) 会把 ORDER BY 原样拼进
+ // SELECT COUNT(*),PostgreSQL 报 "column f_creator_time must appear in the GROUP BY clause"
long total = certService.count(qw);
- qw.last("limit " + (currentPage - 1) * pageSize + "," + pageSize);
+ qw.orderByDesc("f_creator_time");
+ // [FIX] 原 "limit off,size" 是 MySQL 专有语法,PostgreSQL 不认;
+ // 改标准 LIMIT n OFFSET m(PG / MySQL 通用)
+ long size = pageSize <= 0 ? 20 : Math.min(pageSize, 500);
+ long offset = Math.max(0, (currentPage - 1) * size);
+ qw.last("LIMIT " + size + " OFFSET " + offset);
List rows = certService.list(qw);
Map r = new HashMap<>();
r.put("list", rows);
diff --git a/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/LicenseController.java b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/LicenseController.java
index 3353263..c24c1e7 100644
--- a/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/LicenseController.java
+++ b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/LicenseController.java
@@ -33,9 +33,15 @@ public class LicenseController {
if (status != null && !status.isEmpty()) qw.eq("f_status", status);
if (plan != null && !plan.isEmpty()) qw.eq("f_plan", plan);
qw.apply("(f_delete_mark IS NULL OR f_delete_mark = 0)");
- qw.orderByDesc("f_creator_time");
+ // [FIX] count 必须在加 ORDER BY 之前:MP 的 count(wrapper) 会把 ORDER BY 原样拼进
+ // SELECT COUNT(*),PostgreSQL 报 "column f_creator_time must appear in the GROUP BY clause"
long total = licenseService.count(qw);
- qw.last("limit " + (currentPage - 1) * pageSize + "," + pageSize);
+ qw.orderByDesc("f_creator_time");
+ // [FIX] 原 "limit off,size" 是 MySQL 专有语法,PostgreSQL 不认;
+ // 改标准 LIMIT n OFFSET m(PG / MySQL 通用)
+ long size = pageSize <= 0 ? 20 : Math.min(pageSize, 500);
+ long offset = Math.max(0, (currentPage - 1) * size);
+ qw.last("LIMIT " + size + " OFFSET " + offset);
List rows = licenseService.list(qw);
Map r = new HashMap<>();
r.put("list", rows);
diff --git a/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/QuotaController.java b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/QuotaController.java
index 8c36660..3b6e4ac 100644
--- a/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/QuotaController.java
+++ b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/QuotaController.java
@@ -31,9 +31,15 @@ public class QuotaController {
if (dimension != null && !dimension.isEmpty()) qw.eq("f_dimension", dimension);
if (metric != null && !metric.isEmpty()) qw.eq("f_metric", metric);
qw.apply("(f_delete_mark IS NULL OR f_delete_mark = 0)");
- qw.orderByDesc("f_creator_time");
+ // [FIX] count 必须在加 ORDER BY 之前:MP 的 count(wrapper) 会把 ORDER BY 原样拼进
+ // SELECT COUNT(*),PostgreSQL 报 "column f_creator_time must appear in the GROUP BY clause"
long total = quotaService.count(qw);
- qw.last("limit " + (currentPage - 1) * pageSize + "," + pageSize);
+ qw.orderByDesc("f_creator_time");
+ // [FIX] 原 "limit off,size" 是 MySQL 专有语法,PostgreSQL 不认;
+ // 改标准 LIMIT n OFFSET m(PG / MySQL 通用)
+ long size = pageSize <= 0 ? 20 : Math.min(pageSize, 500);
+ long offset = Math.max(0, (currentPage - 1) * size);
+ qw.last("LIMIT " + size + " OFFSET " + offset);
List rows = quotaService.list(qw);
Map r = new HashMap<>();
r.put("list", rows);
diff --git a/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/TdsBridgeInternalController.java b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/TdsBridgeInternalController.java
new file mode 100644
index 0000000..143f8e2
--- /dev/null
+++ b/boot/ssw-tds/ssw-tds-controller/src/main/java/ssw/tds/controller/TdsBridgeInternalController.java
@@ -0,0 +1,296 @@
+package ssw.tds.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ssw.tds.audit.AuditRecordAssembler;
+import ssw.tds.audit.AuditTrailRecorder;
+import ssw.tds.audit.EvidenceAssembler;
+import ssw.tds.entity.ConnectorEntity;
+import ssw.tds.entity.ContractEntity;
+import ssw.tds.entity.DataProductEntity;
+import ssw.tds.service.ConnectorService;
+import ssw.tds.service.ContractService;
+import ssw.tds.service.DataProductService;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TDS 内部桥接入口(供 TDC 聚合运营方全景)[TDC 跨系统读 §Bridge]
+ *
+ * TDC 是独立部署的数据持有方(不连 TDS 库),但其「业务全景 / 信任一屏」需要聚合运营方
+ * TDS 侧的数据(上游合约、连接器、数据产品、哈希链审计、链上存证、审核记录,以及把自己的
+ * 操作留痕汇聚到运营方中枢)。这些跨系统读走 {@code TdcTdsClient}(HTTP 实现
+ * {@code HttpTdcTdsClient}),本控制器就是它依赖的运营方 TDS 侧出口。
+ *
+ * 鉴权模型与 {@code DatasetInternalController} 一致:
+ *
+ * - {@link SaIgnore} 跳过 Sa-Token 用户登录
+ * - 独立 URL 前缀 {@code /api/ssw/tds/Bridge/**},进 {@code exclude-url}
+ * 绕过 JNPF AuthFilter
+ * - 内部鉴权:{@code App-Code: tdc} + {@code X-Internal-Token: }
+ *
+ *
+ * 聚合类端点(审计链/存证/审核记录)直接复用 tds-biz 的装配器
+ * {@link EvidenceAssembler} / {@link AuditRecordAssembler},避免再写一遍丢字段的组装代码;
+ * 留痕端点复用 {@link AuditTrailRecorder} 把 TDC 操作痕迹写入 {@code tds_audit_log} 哈希链。
+ *
+ * @author SSW-TDS
+ */
+@Slf4j
+@RestController("tdsBridgeInternalController")
+@RequestMapping("/api/ssw/tds/Bridge")
+@Tag(name = "TDS 内部桥接入口", description = "供 TDC 等内部子系统聚合运营方全景,App-Code=tdc + X-Internal-Token 鉴权")
+public class TdsBridgeInternalController {
+
+ /** 唯一允许的 App-Code:只有 TDC 节点能来聚合运营方全景 */
+ public static final java.util.Set ALLOWED_APP_CODES = java.util.Set.of("tdc");
+
+ @Autowired(required = false)
+ private ContractService contractService;
+ @Autowired(required = false)
+ private ConnectorService connectorService;
+ @Autowired(required = false)
+ private DataProductService dataProductService;
+ @Autowired(required = false)
+ private EvidenceAssembler evidenceAssembler;
+ @Autowired(required = false)
+ private AuditRecordAssembler auditRecordAssembler;
+ @Autowired(required = false)
+ private AuditTrailRecorder auditTrailRecorder;
+
+ @Value("${tds.internal-secret:}")
+ private String internalSecret;
+
+ // ============================================================ 鉴权
+
+ /**
+ * 校验内部调用身份:App-Code 白名单 + 可选 X-Internal-Token。
+ *
+ * @return 非 null 表示鉴权失败(已封装好 {@link ActionResult}),调用方直接 return
+ */
+ private ActionResult