diff --git a/GUIDE.md b/GUIDE.md index 967f970..8c1bd09 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -46,7 +46,7 @@ HttpTransport → 平台 API | 流水线 | 干什么 | 失败语义 | |:---|:---|:---| -| **读**(单次) | `sdk.salesOrders(key).pull(query)` | 可重跑,靠 canonicalKey upsert 去重 | +| **读**(单次) | `sdk.salesOrders(key, conn).pull(query)` | 可重跑,靠 canonicalKey upsert 去重 | | **批量读** | `SyncEngine` 翻页 + 落库 + 水位线 | 整批成功才推进,失败不推进 | | **写** | `sdk.writes().execute(...)` | 必须幂等,重跑不能重复发货/退款 | @@ -158,8 +158,8 @@ Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现 ```java public final class ChannelSdk implements ProviderResolver { public CapabilityReport capabilities(AccountKey key); // 只读,不发请求 - public SalesOrders salesOrders(AccountKey key); // 订单视图 - public Products products(AccountKey key); // 商品视图 + public SalesOrders salesOrders(AccountKey key, ChannelConnection conn); // 订单视图 + public Products products(AccountKey key, ChannelConnection conn); // 商品视图 public IdempotencyGuard writes(); // 写操作守卫 public PlatformAdapter resolve(AccountKey key); // 按 key 找适配器 } @@ -191,7 +191,7 @@ key → accountRepository.findByKey(provider, platform, omsStoreId) | SPI | 作用 | 读要用 | 写要用 | |:---|:---|:---:|:---:| | `ChannelAccountRepository` | 读渠道账户 | ✅ | ✅ | -| `SecretProvider` | 按 `credentialRef` 取密钥 | ✅ | ✅ | +| `SecretProvider` | ~~按 credentialRef 取密钥~~ **已废弃**:凭据由调用方传入 | — | — | | `TokenStore` | token 读写(宿主加密) | ✅ | ✅ | | `LockProvider` | token 刷新防击穿 | ✅ | ✅ | | `SyncCursorStore` | 水位线 | 批量读 | — | @@ -219,17 +219,17 @@ key → accountRepository.findByKey(provider, platform, omsStoreId) ## 四、三条流水线逐段讲 -### 4.1 单次读:`sdk.salesOrders(key).pull(query)` +### 4.1 单次读:`sdk.salesOrders(key, conn).pull(query)` ```java -Page page = sdk.salesOrders(key).pull(SalesOrderQuery.builder() +Page page = sdk.salesOrders(key, conn).pull(SalesOrderQuery.builder() .updatedAfter(Instant.parse("2026-10-25T00:00:00Z")) // 必填,UTC .updatedBefore(Instant.parse("2026-10-26T00:00:00Z")) // 可选,缺省取 now .pageSize(100) // 会被截到平台上限 .build()); while (page.nextCursor() != null) { - page = sdk.salesOrders(key).pull( + page = sdk.salesOrders(key, conn).pull( SalesOrderQuery.builder()...cursor(page.nextCursor()).build()); } ``` @@ -261,7 +261,7 @@ SyncSpec spec = SyncSpec.of( Instant to = Instant.now(); SyncResult r = new SyncEngine(cursorStore, sink).syncSalesOrders(spec, to, - (from, cursor) -> sdk.salesOrders(key).pull(SalesOrderQuery.builder() + (from, cursor) -> sdk.salesOrders(key, conn).pull(SalesOrderQuery.builder() .updatedAfter(from).updatedBefore(to) .cursor(cursor).build())); @@ -710,7 +710,7 @@ ChannelSdk sdk = ChannelSdk.builder() .build(); AccountKey key = AccountKey.of(ChannelProvider.DIRECT, Platform.AMAZON_SC, "oms-amz-001"); -Page page = sdk.salesOrders(key).pull(query); +Page page = sdk.salesOrders(key, conn).pull(query); ``` **如果你发现要改 `ChannelSdk` 或 `SyncEngine` 才能加进去,说明走歪了。** diff --git a/README.md b/README.md index b59ab52..f80fdbd 100644 --- a/README.md +++ b/README.md @@ -132,10 +132,11 @@ common.ecommerce | 类 | 职责 | |:---|:---| -| `ChannelContext` | 单次调用上下文:`account` + `requestId` + `clock`。**由 SDK 创建,适配器不得自造** | +| `ChannelContext` | 单次调用上下文:`account` + `connection` + `requestId` + `clock`。**由 SDK 创建,适配器不得自造** | | `AdapterFactory` | 适配器工厂:`adapterId()` / `provider()` / `platforms()` / `create(AdapterConfig)` | | `ProviderResolver` | 按 `AccountKey` 解析适配器,不自动选路 | -| `ChannelSdk` | 统一门面:`capabilities()` / `salesOrders()` / `products()` / `writes()`;`build()` 校验必需项 | +| `ChannelSdk` | 统一门面:`capabilities()` / `salesOrders(key, conn)` / `products(key, conn)` / `writes()`;`build()` 校验必需项 | +| `ChannelConnection` | 一次调用的连接信息(端点 + 凭据)。**由调用方每次传入,SDK 不保存** | ### `idempotency` —— 写操作幂等 @@ -160,8 +161,8 @@ common.ecommerce | SPI | 作用 | 典型实现 | |:---|:---|:---| | `ChannelAccountRepository` | 读渠道账户 | MySQL | -| `SecretProvider` | 按 `credentialRef` 取密钥 | KMS / Vault | -| `ChannelSecret` | 密钥载体(appKey/appSecret/clientId/…),只提供 `fingerprint()` 供日志 | +| `SecretProvider` | **已不再使用**:凭据改由调用方经 `ChannelConnection` 传入 | — | +| `ChannelSecret` | 凭据载体(appKey/appSecret/clientId/… + endpointBaseUrl),`fingerprint()` 供日志 | | `TokenStore` | access/refresh token 读写 | MySQL / Redis(加密) | | `AccessToken` | 令牌载体,`needsRefresh(now, earlySec)` 判断提前续期 | | `SyncCursorStore` | 水位线读写 | MySQL | @@ -239,7 +240,7 @@ CanonicalKeys.providerRequestKey(ChannelProvider.DIRECT, Platform.WALMART_SC, "w ### 状态说明 -`ChannelSdk` 门面已可用:`capabilities()` / `salesOrders()` / `products()` / `writes()` 已挂接, +`ChannelSdk` 门面已可用:`capabilities()` / `salesOrders(key, conn)` / `products(key, conn)` / `writes()` 已挂接, `build()` 做必需项校验(缺 `accountRepository`、缺适配器都会抛异常)。 目前仅接入了订单与商品两种能力,其余能力随适配器逐个补齐。 @@ -339,7 +340,7 @@ CapabilityReport caps = sdk.capabilities(key); if (!caps.supports(Capability.SALES_ORDER)) { ... } // 路由完全由调用方决定,SDK 不推荐、不自动兜底 -Page page = sdk.salesOrders(key).pull(query); +Page page = sdk.salesOrders(key, connection).pull(query); ``` `build()` 会在以下情况**立即失败**,不返回不可用的空对象: diff --git a/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java b/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java new file mode 100644 index 0000000..3d30508 --- /dev/null +++ b/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java @@ -0,0 +1,64 @@ +package common.ecommerce.sdk; + +import common.ecommerce.spi.ChannelSecret; + +import java.util.Objects; + +/** + * 一次调用的连接信息:目标地址 + 凭据。 + * + *

由调用方在每次调用时传入,SDK 不保存、不读配置、不读环境变量。 + * 适配器只持有协议(路径、签名算法、限流),不持有「连哪台机器、用谁的身份」。

+ * + *

不同平台需要的凭据字段不同(领星 appId/appSecret、亚马逊 clientId/secret/refreshToken), + * 统一由 {@link ChannelSecret} 承载,适配器按需取用。

+ */ +public final class ChannelConnection { + + private final String endpointBaseUrl; + private final ChannelSecret secret; + + private ChannelConnection(String endpointBaseUrl, ChannelSecret secret) { + if (endpointBaseUrl == null || endpointBaseUrl.trim().isEmpty()) { + throw new IllegalArgumentException("endpointBaseUrl must not be blank"); + } + this.endpointBaseUrl = trimTrailingSlash(endpointBaseUrl.trim()); + Objects.requireNonNull(secret, "secret"); + // 端点写回凭据:TokenManager 的 refresh 回调只拿得到 ChannelSecret + this.secret = ChannelSecret.builder() + .endpointBaseUrl(this.endpointBaseUrl) + .appKey(secret.appKey()) + .appSecret(secret.appSecret()) + .clientId(secret.clientId()) + .clientSecret(secret.clientSecret()) + .refreshToken(secret.refreshToken()) + .build(); + } + + public static ChannelConnection of(String endpointBaseUrl, ChannelSecret secret) { + return new ChannelConnection(endpointBaseUrl, secret); + } + + /** 目标基址,末尾斜杠已去掉。 */ + public String endpointBaseUrl() { + return endpointBaseUrl; + } + + public ChannelSecret secret() { + return secret; + } + + @Override + public String toString() { + // 只打指纹与地址,凭据本体不出现在日志里 + return "ChannelConnection{" + endpointBaseUrl + ", " + secret.fingerprint() + '}'; + } + + private static String trimTrailingSlash(String url) { + int end = url.length(); + while (end > 0 && url.charAt(end - 1) == '/') { + end--; + } + return url.substring(0, end); + } +} diff --git a/core/src/main/java/common/ecommerce/sdk/ChannelContext.java b/core/src/main/java/common/ecommerce/sdk/ChannelContext.java index b1cc9cc..9d31625 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelContext.java +++ b/core/src/main/java/common/ecommerce/sdk/ChannelContext.java @@ -1,27 +1,35 @@ package common.ecommerce.sdk; import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.Platform; +import common.ecommerce.spi.ChannelSecret; import java.time.Clock; +import java.util.Objects; /** * 单次调用的上下文。由 SDK 统一创建并注入适配器,适配器不得自行构造。 + * + *

连接信息(端点、凭据)由调用方在每次请求时传入,见 {@link ChannelConnection}。

*/ public final class ChannelContext { private final ChannelAccount account; + private final ChannelConnection connection; private final String requestId; private final Clock clock; - private ChannelContext(ChannelAccount account, String requestId, Clock clock) { - this.account = account; + private ChannelContext(ChannelAccount account, ChannelConnection connection, String requestId, Clock clock) { + this.account = Objects.requireNonNull(account, "account"); + this.connection = Objects.requireNonNull(connection, "connection"); this.requestId = requestId; - this.clock = clock; + this.clock = Objects.requireNonNull(clock, "clock"); } - public static ChannelContext of(ChannelAccount account, String requestId, Clock clock) { - return new ChannelContext(account, requestId, clock); + public static ChannelContext of(ChannelAccount account, ChannelConnection connection, + String requestId, Clock clock) { + return new ChannelContext(account, connection, requestId, clock); } public ChannelAccount account() { @@ -36,6 +44,25 @@ public final class ChannelContext { return account.platform(); } + public ChannelProvider provider() { + return account.provider(); + } + + /** 本次调用的连接信息,由调用方传入。 */ + public ChannelConnection connection() { + return connection; + } + + /** 本次调用的目标基址。 */ + public String endpointBaseUrl() { + return connection.endpointBaseUrl(); + } + + /** 本次调用的凭据,SDK 不落盘。 */ + public ChannelSecret secret() { + return connection.secret(); + } + /** 链路 ID,用于日志与原始报文关联。 */ public String requestId() { return requestId; diff --git a/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java b/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java index 89e927d..78ba54a 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java +++ b/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java @@ -32,6 +32,9 @@ import java.util.UUID; *

provider 由调用方在 {@link AccountKey} 中显式指定,SDK 不推荐、 * 不自动选路、不自动兜底;能力缺失时抛 * {@code ChannelException.UnsupportedCapabilityException}。

+ * + *

连接信息由调用方每次传入,见 {@link ChannelConnection}:SDK 不保存端点、 + * 不读配置、不读环境变量。门面只负责按 {@link AccountKey} 找账户与适配器。

*/ public final class ChannelSdk implements ProviderResolver { @@ -62,15 +65,15 @@ public final class ChannelSdk implements ProviderResolver { } /** 3P 销售订单视图。 */ - public SalesOrders salesOrders(AccountKey key) { + public SalesOrders salesOrders(AccountKey key, ChannelConnection connection) { ChannelAccount account = requireAccount(key); - return new SalesOrders(resolve(key), account, newContext(account)); + return new SalesOrders(resolve(key), account, newContext(account, connection)); } /** 商品 / Listing 视图。 */ - public Products products(AccountKey key) { + public Products products(AccountKey key, ChannelConnection connection) { ChannelAccount account = requireAccount(key); - return new Products(resolve(key), account, newContext(account)); + return new Products(resolve(key), account, newContext(account, connection)); } /** @@ -104,8 +107,8 @@ public final class ChannelSdk implements ProviderResolver { .orElseThrow(() -> new IllegalStateException("channel account not configured: " + key)); } - private ChannelContext newContext(ChannelAccount account) { - return ChannelContext.of(account, UUID.randomUUID().toString(), clock); + private ChannelContext newContext(ChannelAccount account, ChannelConnection connection) { + return ChannelContext.of(account, connection, UUID.randomUUID().toString(), clock); } /** 注册维度:provider + platform。同一组合下只能有一个适配器。 */ diff --git a/core/src/main/java/common/ecommerce/spi/ChannelSecret.java b/core/src/main/java/common/ecommerce/spi/ChannelSecret.java index 378dd4d..b1c9d2b 100644 --- a/core/src/main/java/common/ecommerce/spi/ChannelSecret.java +++ b/core/src/main/java/common/ecommerce/spi/ChannelSecret.java @@ -7,6 +7,7 @@ import java.util.Objects; */ public final class ChannelSecret { + private final String endpointBaseUrl; private final String appKey; private final String appSecret; private final String clientId; @@ -14,6 +15,7 @@ public final class ChannelSecret { private final String refreshToken; private ChannelSecret(Builder b) { + this.endpointBaseUrl = b.endpointBaseUrl; this.appKey = b.appKey; this.appSecret = b.appSecret; this.clientId = b.clientId; @@ -25,6 +27,14 @@ public final class ChannelSecret { return new Builder(); } + /** + * 调用方指定的目标基址。凭据与端点绑定在一起,避免 TokenManager 的 refresh 回调拿不到地址 + * (缓存命中时 Context 不参与调用)。整个对象只经调用方传入,SDK 不落盘。 + */ + public String endpointBaseUrl() { + return endpointBaseUrl; + } + public String appKey() { return appKey; } @@ -53,12 +63,19 @@ public final class ChannelSecret { public static final class Builder { + private String endpointBaseUrl; private String appKey; private String appSecret; private String clientId; private String clientSecret; private String refreshToken; + /** 端点与凭据一起传入;TokenManager 刷新时需要它。 */ + public Builder endpointBaseUrl(String endpointBaseUrl) { + this.endpointBaseUrl = endpointBaseUrl; + return this; + } + public Builder appKey(String appKey) { this.appKey = appKey; return this; diff --git a/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java b/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java index 45f5acf..2e5b744 100644 --- a/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java +++ b/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java @@ -34,6 +34,11 @@ class ChannelSdkTest { private static final AccountKey WM = AccountKey.of(ChannelProvider.DIRECT, Platform.WALMART_SC, "oms-wm-001"); + /** 连接信息由调用方每次传入,测试里固定一份。 */ + private static final ChannelConnection CONNECTION = ChannelConnection.of( + "https://api.example.com", + common.ecommerce.spi.ChannelSecret.builder().appKey("ak").appSecret("sk").build()); + /** 假直连适配器:单平台,只有订单能力。 */ static final class FakeDirectAdapter implements common.ecommerce.capability.SalesOrderCapable { @@ -150,7 +155,7 @@ class ChannelSdkTest { @Test void facadeDelegatesToAdapter() { ChannelSdk sdk = sdkWith(new FakeDirectAdapter()); - Page page = sdk.salesOrders(WM).pull(SalesOrderQuery.builder() + Page page = sdk.salesOrders(WM, CONNECTION).pull(SalesOrderQuery.builder() .updatedAfter(java.time.Instant.parse("2026-10-25T00:00:00Z")) .build()); assertNotNull(page); @@ -161,7 +166,7 @@ class ChannelSdkTest { void missingCapabilityThrowsUnsupported() { ChannelSdk sdk = sdkWith(new FakeDirectAdapter()); assertThrows(ChannelException.UnsupportedCapabilityException.class, - () -> sdk.products(WM).pull(common.ecommerce.model.product.ProductQuery.builder().build())); + () -> sdk.products(WM, CONNECTION).pull(common.ecommerce.model.product.ProductQuery.builder().build())); } @Test diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java index 20d87d4..8df2f90 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java @@ -22,7 +22,6 @@ import common.ecommerce.sdk.ChannelContext; import common.ecommerce.spi.AccessToken; import common.ecommerce.spi.ChannelSecret; import common.ecommerce.spi.LockProvider; -import common.ecommerce.spi.SecretProvider; import common.ecommerce.spi.TokenStore; import java.time.Clock; @@ -45,35 +44,33 @@ import java.util.Set; */ public final class LingxingAdapter implements SalesOrderCapable, AggregatorCapable { - private final String baseUrl; private final HttpTransport transport; private final JacksonJsonCodec json; - private final SecretProvider secretProvider; private final Clock clock; private final LingxingOrderMapper mapper; private final TokenManager tokenManager; private final LingxingRateLimiter rateLimiter; private final LingxingRequestFactory requestFactory; - public LingxingAdapter(String baseUrl, HttpTransport transport, JacksonJsonCodec json, - SecretProvider secretProvider, TokenStore tokenStore, LockProvider lockProvider, - Clock clock) { - this.baseUrl = baseUrl; + /** + * 适配器只持有协议与基础设施,不持有端点与凭据——两者随每次调用传入。 + */ + public LingxingAdapter(HttpTransport transport, JacksonJsonCodec json, + TokenStore tokenStore, LockProvider lockProvider, Clock clock) { this.transport = transport; this.json = json; - this.secretProvider = secretProvider; this.clock = clock; this.mapper = new LingxingOrderMapper(json); - final LingxingTokenClient tokenClient = new LingxingTokenClient(transport, json, baseUrl, clock); + final LingxingTokenClient tokenClient = new LingxingTokenClient(transport, json, clock); // 领星 access_token 约 2h,提前 10 分钟续期 this.tokenManager = new TokenManager(tokenStore, lockProvider, clock, 600) { @Override protected AccessToken refresh(ChannelSecret secret, AccessToken previous) { - return tokenClient.fetch(secret.appKey(), secret.appSecret()); + return tokenClient.fetch(secret.endpointBaseUrl(), secret.appKey(), secret.appSecret()); } }; this.rateLimiter = new LingxingRateLimiter(); - this.requestFactory = new LingxingRequestFactory(baseUrl, json, clock); + this.requestFactory = new LingxingRequestFactory(json, clock); } @Override @@ -214,10 +211,9 @@ public final class LingxingAdapter implements SalesOrderCapable, AggregatorCapab } private HttpRequest signedRequest(ChannelContext ctx, String path, Map body, String operation) { - ChannelAccount account = ctx.account(); - ChannelSecret secret = secretProvider.get(account.credentialRef()); - AccessToken token = tokenManager.getOrRefresh(tokenKey(account, secret), secret); - return requestFactory.post(path, body, secret, token, ctx, operation); + ChannelSecret secret = ctx.secret(); + AccessToken token = tokenManager.getOrRefresh(tokenKey(secret), secret); + return requestFactory.post(ctx.endpointBaseUrl(), path, body, secret, token, ctx, operation); } /** @@ -225,7 +221,7 @@ public final class LingxingAdapter implements SalesOrderCapable, AggregatorCapab * 同一 app 下的多家店铺共用一个 token。用 appKey 而不是 store_id, * 避免同 app 多店铺重复换 token 白烧配额。 */ - private static String tokenKey(ChannelAccount account, ChannelSecret secret) { + private static String tokenKey(ChannelSecret secret) { return "lingxing:" + secret.appKey(); } } \ No newline at end of file diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java index b375068..c62fd43 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java @@ -5,7 +5,6 @@ import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.Platform; import common.ecommerce.sdk.AdapterFactory; import common.ecommerce.spi.LockProvider; -import common.ecommerce.spi.SecretProvider; import common.ecommerce.spi.TokenStore; import com.fasterxml.jackson.databind.ObjectMapper; @@ -17,14 +16,11 @@ import java.util.EnumSet; */ public final class LingxingAdapterFactory implements AdapterFactory { - private final SecretProvider secretProvider; private final TokenStore tokenStore; private final LockProvider lockProvider; private final Clock clock; - public LingxingAdapterFactory(SecretProvider secretProvider, TokenStore tokenStore, - LockProvider lockProvider, Clock clock) { - this.secretProvider = secretProvider; + public LingxingAdapterFactory(TokenStore tokenStore, LockProvider lockProvider, Clock clock) { this.tokenStore = tokenStore; this.lockProvider = lockProvider; this.clock = clock; @@ -46,13 +42,14 @@ public final class LingxingAdapterFactory implements AdapterFactory { Platform.TEMU, Platform.EBAY, Platform.SHEIN, Platform.MIRAKL, Platform.CUSTOM); } + /** + * 端点与凭据由调用方在每次请求时传入,工厂只装配协议与基础设施。 + */ @Override public PlatformAdapter create(AdapterConfig config) { - String baseUrl = config.endpointBaseUrl() == null - ? LingxingConstants.DEFAULT_BASE_URL : config.endpointBaseUrl(); - return new LingxingAdapter(baseUrl, + return new LingxingAdapter( new common.ecommerce.http.OkHttpTransport("common-ecommerce/1.0.0 (lingxing)"), new common.ecommerce.http.JacksonJsonCodec(), - secretProvider, tokenStore, lockProvider, clock); + tokenStore, lockProvider, clock); } } diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java index 2e9bfa0..3ed001d 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java @@ -9,8 +9,13 @@ import common.ecommerce.model.Platform; */ public final class LingxingConstants { - /** 生产环境基址;仅在测试/联调时由 AdapterConfig 覆盖。 */ - public static final String DEFAULT_BASE_URL = "https://openapi.lingxing.com"; + /** + * 领星生产基址,仅作参考文档与测试常量。 + * + *

SDK 运行时不使用它:端点由调用方在每次调用时通过 + * {@code ChannelConnection} 传入,SDK 不保存、不读配置。

+ */ + public static final String PRODUCTION_BASE_URL = "https://openapi.lingxing.com"; public static final String ADAPTER_ID = "lingxing"; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java index d90afb4..8e298ff 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java @@ -25,17 +25,15 @@ import java.util.Map; */ final class LingxingRequestFactory { - private final String baseUrl; private final JacksonJsonCodec json; private final Clock clock; - LingxingRequestFactory(String baseUrl, JacksonJsonCodec json, Clock clock) { - this.baseUrl = baseUrl; + LingxingRequestFactory(JacksonJsonCodec json, Clock clock) { this.json = json; this.clock = clock; } - HttpRequest post(String path, Map body, ChannelSecret secret, + HttpRequest post(String baseUrl, String path, Map body, ChannelSecret secret, AccessToken token, ChannelContext ctx, String operation) { Map payload = withoutNulls(body); diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java index f096aaf..3ed5fa4 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java @@ -37,24 +37,23 @@ public final class LingxingTokenClient { private final HttpTransport transport; private final JsonCodec json; - private final String baseUrl; private final Clock clock; - public LingxingTokenClient(HttpTransport transport, JsonCodec json, String baseUrl, Clock clock) { + public LingxingTokenClient(HttpTransport transport, JsonCodec json, Clock clock) { this.transport = transport; this.json = json; - this.baseUrl = baseUrl; this.clock = clock; } - public AccessToken fetch(String appId, String appSecret) { + /** 端点由调用方每次传入,与其它接口一致。 */ + public AccessToken fetch(String baseUrl, String appId, String appSecret) { Map form = new LinkedHashMap(); form.put("appId", appId); form.put("appSecret", appSecret); HttpRequest req = HttpRequest.builder() .method("POST") - .url(baseUrl + LingxingConstants.PATH_ACCESS_TOKEN) + .url(trimTrailingSlash(baseUrl) + LingxingConstants.PATH_ACCESS_TOKEN) .contentType(MULTIPART_CONTENT_TYPE) .body(multipartBody(form)) .operation("token.refresh") @@ -108,6 +107,14 @@ public final class LingxingTokenClient { } } + private static String trimTrailingSlash(String url) { + int end = url.length(); + while (end > 0 && url.charAt(end - 1) == '/') { + end--; + } + return url.substring(0, end); + } + /** multipart/form-data 请求体;字段值不做转义,appId/appSecret 只含安全字符。 */ private static String multipartBody(Map form) { StringBuilder sb = new StringBuilder(); diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingAdapterTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingAdapterTest.java index c403ff1..b57d2a0 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingAdapterTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingAdapterTest.java @@ -9,6 +9,7 @@ import common.ecommerce.model.support.Page; import common.ecommerce.model.Platform; import common.ecommerce.model.order.SalesOrder; import common.ecommerce.model.order.SalesOrderQuery; +import common.ecommerce.sdk.ChannelConnection; import common.ecommerce.sdk.ChannelContext; import common.ecommerce.spi.ChannelSecret; import common.ecommerce.sync.SyncEngine; @@ -53,6 +54,7 @@ class LingxingAdapterTest { private LingxingAdapter adapter; private ChannelAccount account; private ChannelContext ctx; + private ChannelSecret secret; @BeforeEach void setUp() { @@ -70,16 +72,16 @@ class LingxingAdapterTest { .currency("USD") .build(); - accounts.put(account).putSecret(CREDENTIAL_REF, ChannelSecret.builder() + secret = ChannelSecret.builder() .appKey(APP_KEY) .appSecret("test-app-secret") - .build()); + .build(); Clock clock = Clock.fixed(Instant.parse("2026-10-29T00:00:00Z"), ZoneOffset.UTC); - adapter = new LingxingAdapter(LingxingConstants.DEFAULT_BASE_URL, transport, new JacksonJsonCodec(), - accounts, tokenStore, locks, clock); + adapter = new LingxingAdapter(transport, new JacksonJsonCodec(), tokenStore, locks, clock); - ctx = ChannelContext.of(account, "req-1", clock); + ctx = ChannelContext.of(account, ChannelConnection.of("https://openapi.lingxing.com", secret), + "req-1", clock); String tokenJson = Fixtures.load(LingxingAdapterTest.class, "lingxing", "token", "success"); String orderJson = Fixtures.load(LingxingAdapterTest.class, "lingxing", "orderList", "success"); diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java index 1aba5eb..fb3af5f 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java @@ -12,10 +12,10 @@ import common.ecommerce.model.support.Page; import common.ecommerce.model.Platform; import common.ecommerce.model.order.SalesOrder; import common.ecommerce.model.order.SalesOrderQuery; +import common.ecommerce.sdk.ChannelConnection; import common.ecommerce.sdk.ChannelContext; import common.ecommerce.spi.AccessToken; import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryAccounts; import common.ecommerce.testkit.InMemoryLockProvider; import common.ecommerce.testkit.InMemoryTokenStore; import org.junit.jupiter.api.Test; @@ -53,19 +53,18 @@ class LingxingLiveSmokeTest { private static final int PLATFORM_CODE = Integer.parseInt( System.getenv().getOrDefault("LINGXING_PLATFORM_CODE", "10008")); private static final String BASE_URL = System.getenv().getOrDefault( - "LINGXING_BASE_URL", LingxingConstants.DEFAULT_BASE_URL); + "LINGXING_BASE_URL", LingxingConstants.PRODUCTION_BASE_URL); private final JacksonJsonCodec json = new JacksonJsonCodec(); private final LoggingTransport transport = new LoggingTransport(new OkHttpTransport("common-ecommerce-smoke")); private final InMemoryTokenStore tokenStore = new InMemoryTokenStore(); private final InMemoryLockProvider locks = new InMemoryLockProvider(); - private final InMemoryAccounts accounts = new InMemoryAccounts(); /** 第 1 步:只验证认证。失败说明 appId/appSecret 字段名或环境不对,与订单接口无关。 */ @Test void tokenCanBeFetched() { - AccessToken token = new LingxingTokenClient(transport, json, BASE_URL, Clock.systemUTC()) - .fetch(APP_KEY, APP_SECRET); + AccessToken token = new LingxingTokenClient(transport, json, Clock.systemUTC()) + .fetch(BASE_URL, APP_KEY, APP_SECRET); System.out.println("[token] " + token.fingerprint() + " expiresAt=" + token.expiresAt()); assertNotNull(token.value()); } @@ -74,8 +73,8 @@ class LingxingLiveSmokeTest { @Test void pullsOnePageOfOrders() { LingxingAdapter adapter = adapter(); - ChannelContext ctx = ChannelContext.of(account(), "smoke-" + System.currentTimeMillis(), - Clock.systemUTC()); + ChannelContext ctx = ChannelContext.of(account(), connection(), + "smoke-" + System.currentTimeMillis(), Clock.systemUTC()); Instant to = Instant.now(); Instant from = to.minus(Duration.ofDays(2)); @@ -102,9 +101,13 @@ class LingxingLiveSmokeTest { // ---------------------------------------------------------------- helpers private LingxingAdapter adapter() { - accounts.put(account()).putSecret("smoke", ChannelSecret.builder() + return new LingxingAdapter(transport, json, tokenStore, locks, Clock.systemUTC()); + } + + /** 端点与凭据由调用方传入;冒烟测试里来自环境变量。 */ + private ChannelConnection connection() { + return ChannelConnection.of(BASE_URL, ChannelSecret.builder() .appKey(APP_KEY).appSecret(APP_SECRET).build()); - return new LingxingAdapter(BASE_URL, transport, json, accounts, tokenStore, locks, Clock.systemUTC()); } private ChannelAccount account() { diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java index 4f18ac0..5fd1270 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java @@ -6,6 +6,7 @@ import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.Platform; import common.ecommerce.model.account.AccountKey; import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.sdk.ChannelConnection; import common.ecommerce.sdk.ChannelContext; import common.ecommerce.spi.AccessToken; import common.ecommerce.spi.ChannelSecret; @@ -50,11 +51,11 @@ class LingxingRequestFactoryTest { .marketplaceZone("America/Los_Angeles") .currency("USD") .build(); - ChannelContext ctx = ChannelContext.of(account, "req-1", clock); + String baseUrl = "https://openapi.lingxing.com"; + ChannelContext ctx = ChannelContext.of(account, ChannelConnection.of(baseUrl, secret), "req-1", clock); - HttpRequest req = new LingxingRequestFactory("https://openapi.lingxing.com", - new JacksonJsonCodec(), clock) - .post("/pb/mp/order/v2/list", body, secret, token, ctx, "salesOrders.pull"); + HttpRequest req = new LingxingRequestFactory(new JacksonJsonCodec(), clock) + .post(baseUrl, "/pb/mp/order/v2/list", body, secret, token, ctx, "salesOrders.pull"); Map signParams = new LinkedHashMap(); signParams.put("offset", "0"); diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingTokenClientTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingTokenClientTest.java index f3b4324..5783e78 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingTokenClientTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/LingxingTokenClientTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ class LingxingTokenClientTest { - private static final String BASE_URL = LingxingConstants.DEFAULT_BASE_URL; + private static final String BASE_URL = LingxingConstants.PRODUCTION_BASE_URL; private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-10-30T00:00:00Z"), ZoneOffset.UTC); private FakeTransport transport; @@ -32,7 +32,7 @@ class LingxingTokenClientTest { @BeforeEach void setUp() { transport = FakeTransport.create(); - client = new LingxingTokenClient(transport, new JacksonJsonCodec(), BASE_URL, CLOCK); + client = new LingxingTokenClient(transport, new JacksonJsonCodec(), CLOCK); } @Test @@ -40,7 +40,7 @@ class LingxingTokenClientTest { transport.route(LingxingConstants.PATH_ACCESS_TOKEN, "POST", r -> Responses.ok(Fixtures.load(getClass(), "lingxing", "token", "success"))); - client.fetch("my-app-id", "my-secret"); + client.fetch(BASE_URL, "my-app-id", "my-secret"); HttpRequest req = transport.lastRequest(); assertEquals("POST", req.method()); @@ -55,7 +55,7 @@ class LingxingTokenClientTest { transport.route(LingxingConstants.PATH_ACCESS_TOKEN, "POST", r -> Responses.ok(Fixtures.load(getClass(), "lingxing", "token", "success"))); - AccessToken token = client.fetch("id", "secret"); + AccessToken token = client.fetch(BASE_URL, "id", "secret"); assertEquals("lx-access-token-abc", token.value()); assertEquals("lx-refresh-token-xyz", token.refreshToken()); @@ -69,7 +69,7 @@ class LingxingTokenClientTest { transport.route(LingxingConstants.PATH_ACCESS_TOKEN, "POST", r -> Responses.ok(Fixtures.load(getClass(), "lingxing", "token", "auth_failed"))); - AuthException ex = assertThrows(AuthException.class, () -> client.fetch("id", "bad")); + AuthException ex = assertThrows(AuthException.class, () -> client.fetch(BASE_URL, "id", "bad")); assertTrue(ex.getMessage().contains("2001001"), ex.getMessage()); assertTrue(ex.getMessage().contains("app not exist"), ex.getMessage()); assertEquals("2001001", ex.platformCode()); @@ -80,7 +80,7 @@ class LingxingTokenClientTest { transport.route(LingxingConstants.PATH_ACCESS_TOKEN, "POST", r -> Responses.ok("{\"code\":\"200\",\"msg\":\"OK\",\"data\":{}}")); - AuthException ex = assertThrows(AuthException.class, () -> client.fetch("id", "secret")); + AuthException ex = assertThrows(AuthException.class, () -> client.fetch(BASE_URL, "id", "secret")); assertTrue(ex.getMessage().contains("data.access_token"), ex.getMessage()); } @@ -90,6 +90,6 @@ class LingxingTokenClientTest { r -> Responses.status(500, "boom")); assertThrows(common.ecommerce.error.TransientException.class, - () -> client.fetch("id", "secret")); + () -> client.fetch(BASE_URL, "id", "secret")); } } diff --git a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java b/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java index b1b36d7..798a7fb 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java +++ b/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java @@ -19,7 +19,9 @@ import common.ecommerce.model.product.ProductSyncStrategy; import common.ecommerce.model.order.SalesOrder; import common.ecommerce.model.order.SalesOrderQuery; import common.ecommerce.model.order.SalesOrderRef; +import common.ecommerce.sdk.ChannelConnection; import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.spi.ChannelSecret; import java.time.Instant; import java.util.ArrayList; @@ -80,6 +82,12 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl .build(); } + /** 测试用连接信息:调用方每次传入的那一份。 */ + public static ChannelConnection connection() { + return ChannelConnection.of("https://fake.example.com", + ChannelSecret.builder().appKey("fake-key").appSecret("fake-secret").build()); + } + @Override public String adapterId() { return adapterId; diff --git a/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java b/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java index 6ae7080..6073dc9 100644 --- a/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java +++ b/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java @@ -40,7 +40,7 @@ class FakeDirectAdapterTest { private static ChannelContext ctx() { ChannelAccount account = FakeDirectAdapter.account(Platform.WALMART_SC, "oms-test-001"); - return ChannelContext.of(account, "req-1", CLOCK); + return ChannelContext.of(account, FakeDirectAdapter.connection(), "req-1", CLOCK); } @Test