Browse Source

refactor(lingxing): 按职责拆分 adapter / auth / http / mapper / dto 五个包

- adapter:LingxingAdapter、LingxingAdapterFactory(入口)
- auth:LingxingTokenClient(换 token)
- http:RequestFactory / Signer / Envelope / RateLimiter(出网与响应判定)
- mapper:LingxingOrderMapper(DTO → 统一模型)
- dto:领星原始报文结构(不变)
- 根包只留 LingxingConstants

跨包使用后 RateLimiter / RequestFactory 的构造器与 post/acquire 提升为 public。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 3 weeks ago
parent
commit
89f29d7767
  1. 10
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
  2. 3
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java
  3. 3
      lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java
  4. 3
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java
  5. 12
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRateLimiter.java
  6. 8
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java
  7. 2
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java
  8. 6
      lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java
  9. 4
      lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java
  10. 2
      lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java
  11. 2
      lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRateLimiterTest.java
  12. 2
      lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java
  13. 2
      lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingSignerTest.java

10
lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java → lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java

@ -1,4 +1,11 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.adapter;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.dto.LingxingOrderDto;
import common.ecommerce.lingxing.mapper.LingxingOrderMapper;
import common.ecommerce.lingxing.http.LingxingRateLimiter;
import common.ecommerce.lingxing.http.LingxingRequestFactory;
import common.ecommerce.lingxing.auth.LingxingTokenClient;
import common.ecommerce.capability.AggregatorCapable; import common.ecommerce.capability.AggregatorCapable;
import common.ecommerce.capability.SalesOrderCapable; import common.ecommerce.capability.SalesOrderCapable;
@ -9,7 +16,6 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.HttpTransport; import common.ecommerce.http.HttpTransport;
import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.TokenManager; import common.ecommerce.http.TokenManager;
import common.ecommerce.lingxing.dto.LingxingOrderDto;
import common.ecommerce.model.Capability; import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount; import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.ChannelProvider;

3
lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java → lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java

@ -1,4 +1,5 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.adapter;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.capability.PlatformAdapter; import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.ChannelProvider;

3
lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java → lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java

@ -1,4 +1,5 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.auth;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.error.AuthException; import common.ecommerce.error.AuthException;
import common.ecommerce.error.ChannelException; import common.ecommerce.error.ChannelException;

3
lingxing/src/main/java/common/ecommerce/lingxing/LingxingEnvelope.java → lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java

@ -1,4 +1,5 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.error.AuthException; import common.ecommerce.error.AuthException;
import common.ecommerce.error.ChannelException; import common.ecommerce.error.ChannelException;

12
lingxing/src/main/java/common/ecommerce/lingxing/LingxingRateLimiter.java → lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRateLimiter.java

@ -1,4 +1,4 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -12,10 +12,10 @@ import java.util.function.LongSupplier;
* *
* <p>进程内实现,多实例部署会叠加;需要跨实例限流时由宿主替换。</p> * <p>进程内实现,多实例部署会叠加;需要跨实例限流时由宿主替换。</p>
*/ */
final class LingxingRateLimiter { public final class LingxingRateLimiter {
/** 便于测试注入,生产用 {@link Thread#sleep}。 */ /** 便于测试注入,生产用 {@link Thread#sleep}。 */
interface Sleeper { public interface Sleeper {
void sleep(long millis, int nanos); void sleep(long millis, int nanos);
} }
@ -23,7 +23,7 @@ final class LingxingRateLimiter {
private final Sleeper sleeper; private final Sleeper sleeper;
private final LongSupplier nanoClock; private final LongSupplier nanoClock;
LingxingRateLimiter() { public LingxingRateLimiter() {
this(new Sleeper() { this(new Sleeper() {
@Override @Override
public void sleep(long millis, int nanos) { public void sleep(long millis, int nanos) {
@ -41,13 +41,13 @@ final class LingxingRateLimiter {
}); });
} }
LingxingRateLimiter(Sleeper sleeper, LongSupplier nanoClock) { public LingxingRateLimiter(Sleeper sleeper, LongSupplier nanoClock) {
this.sleeper = sleeper; this.sleeper = sleeper;
this.nanoClock = nanoClock; this.nanoClock = nanoClock;
} }
/** 同一路径两次调用之间至少间隔 {@code 1e9 / permitsPerSecond} 纳秒。 */ /** 同一路径两次调用之间至少间隔 {@code 1e9 / permitsPerSecond} 纳秒。 */
synchronized void acquire(String path, int permitsPerSecond) { public synchronized void acquire(String path, int permitsPerSecond) {
if (permitsPerSecond <= 0) { if (permitsPerSecond <= 0) {
return; return;
} }

8
lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java → lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java

@ -1,4 +1,4 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.http.JacksonJsonCodec;
@ -23,17 +23,17 @@ import java.util.Map;
* *
* <p>{@code access_token} 只放 {@code Authorization} 头、不进 query,但必须参与签名。</p> * <p>{@code access_token} 只放 {@code Authorization} 头、不进 query,但必须参与签名。</p>
*/ */
final class LingxingRequestFactory { public final class LingxingRequestFactory {
private final JacksonJsonCodec json; private final JacksonJsonCodec json;
private final Clock clock; private final Clock clock;
LingxingRequestFactory(JacksonJsonCodec json, Clock clock) { public LingxingRequestFactory(JacksonJsonCodec json, Clock clock) {
this.json = json; this.json = json;
this.clock = clock; this.clock = clock;
} }
HttpRequest post(String baseUrl, String path, Map<String, Object> body, ChannelSecret secret, public HttpRequest post(String baseUrl, String path, Map<String, Object> body, ChannelSecret secret,
AccessToken token, ChannelContext ctx, String operation) { AccessToken token, ChannelContext ctx, String operation) {
Map<String, Object> payload = withoutNulls(body); Map<String, Object> payload = withoutNulls(body);

2
lingxing/src/main/java/common/ecommerce/lingxing/LingxingSigner.java → lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java

@ -1,4 +1,4 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import common.ecommerce.spi.ChannelSecret; import common.ecommerce.spi.ChannelSecret;

6
lingxing/src/main/java/common/ecommerce/lingxing/LingxingOrderMapper.java → lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java

@ -1,10 +1,10 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.mapper;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.lingxing.dto.LingxingOrderDto; import common.ecommerce.lingxing.dto.LingxingOrderDto;
import common.ecommerce.lingxing.dto.LingxingOrderItemDto; import common.ecommerce.lingxing.dto.LingxingOrderItemDto;
import common.ecommerce.lingxing.dto.LingxingPlatformInfoDto; import common.ecommerce.lingxing.dto.LingxingPlatformInfoDto;
import common.ecommerce.lingxing.dto.LingxingTransactionInfoDto; import common.ecommerce.lingxing.dto.LingxingTransactionInfoDto;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.order.OrderLine; import common.ecommerce.model.order.OrderLine;
import common.ecommerce.model.order.SalesOrder; import common.ecommerce.model.order.SalesOrder;

4
lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java → lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java

@ -1,4 +1,6 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.adapter;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.lingxing.auth.LingxingTokenClient;
import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpResponse;

2
lingxing/src/test/java/common/ecommerce/lingxing/LingxingEnvelopeTest.java → lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java

@ -1,4 +1,4 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import common.ecommerce.error.AuthException; import common.ecommerce.error.AuthException;
import common.ecommerce.error.PlatformBusinessException; import common.ecommerce.error.PlatformBusinessException;

2
lingxing/src/test/java/common/ecommerce/lingxing/LingxingRateLimiterTest.java → lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRateLimiterTest.java

@ -1,4 +1,4 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

2
lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java → lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java

@ -1,4 +1,4 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.http.JacksonJsonCodec;

2
lingxing/src/test/java/common/ecommerce/lingxing/LingxingSignerTest.java → lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingSignerTest.java

@ -1,4 +1,4 @@
package common.ecommerce.lingxing; package common.ecommerce.lingxing.http;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
Loading…
Cancel
Save