优化

lastleg-service/src/main/java/com/baiyue/lastleg/config/LastlegRestClientFactory.java

@@ -0,0 +1,21 @@
+package com.baiyue.lastleg.config;
+
+import org.springframework.http.client.JdkClientHttpRequestFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClient;
+
+import java.net.http.HttpClient;
+
+@Component
+public class LastlegRestClientFactory {
+    public RestClient build(RestClient.Builder builder, String baseUrl,
+                            LastlegRestClientProperties.ClientTimeouts timeouts) {
+        HttpClient httpClient = HttpClient.newBuilder()
+            .connectTimeout(timeouts.getConnectTimeout())
+            .build();
+        JdkClientHttpRequestFactory requestFactory = new JdkClientHttpRequestFactory(httpClient);
+        requestFactory.setReadTimeout(timeouts.getReadTimeout());
+        return builder.requestFactory(requestFactory).baseUrl(baseUrl).build();
+    }
+}
+

lastleg-service/src/main/java/com/baiyue/lastleg/config/LastlegRestClientProperties.java

@@ -0,0 +1,54 @@
+package com.baiyue.lastleg.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+@Component
+@ConfigurationProperties(prefix = "baiyue.http.clients")
+public class LastlegRestClientProperties {
+    private ClientTimeouts unloadPhotoFile = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(30));
+    private ClientTimeouts relabelPhotoFile = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(30));
+    private ClientTimeouts warehouseResource = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(5));
+    private ClientTimeouts palletPhysical = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(5));
+
+    public ClientTimeouts getUnloadPhotoFile() { return unloadPhotoFile; }
+    public void setUnloadPhotoFile(ClientTimeouts value) { unloadPhotoFile = required(value, "unload-photo-file"); }
+    public ClientTimeouts getRelabelPhotoFile() { return relabelPhotoFile; }
+    public void setRelabelPhotoFile(ClientTimeouts value) { relabelPhotoFile = required(value, "relabel-photo-file"); }
+    public ClientTimeouts getWarehouseResource() { return warehouseResource; }
+    public void setWarehouseResource(ClientTimeouts value) { warehouseResource = required(value, "warehouse-resource"); }
+    public ClientTimeouts getPalletPhysical() { return palletPhysical; }
+    public void setPalletPhysical(ClientTimeouts value) { palletPhysical = required(value, "pallet-physical"); }
+
+    private static ClientTimeouts required(ClientTimeouts value, String client) {
+        if (value == null) throw new IllegalArgumentException(client + " HTTP timeouts are required");
+        return value;
+    }
+
+    public static class ClientTimeouts {
+        private Duration connectTimeout;
+        private Duration readTimeout;
+
+        public ClientTimeouts() { }
+
+        public ClientTimeouts(Duration connectTimeout, Duration readTimeout) {
+            setConnectTimeout(connectTimeout);
+            setReadTimeout(readTimeout);
+        }
+
+        public Duration getConnectTimeout() { return connectTimeout; }
+        public void setConnectTimeout(Duration value) { connectTimeout = positive(value, "connect-timeout"); }
+        public Duration getReadTimeout() { return readTimeout; }
+        public void setReadTimeout(Duration value) { readTimeout = positive(value, "read-timeout"); }
+
+        private static Duration positive(Duration value, String name) {
+            if (value == null || value.isZero() || value.isNegative()) {
+                throw new IllegalArgumentException(name + " must be positive");
+            }
+            return value;
+        }
+    }
+}
+

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/gateway/HttpUnloadPhotoFileGateway.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.inboundplan.pda.gateway;
 
+import com.baiyue.lastleg.config.LastlegRestClientFactory;
+import com.baiyue.lastleg.config.LastlegRestClientProperties;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,12 +21,17 @@ import java.io.IOException;
 public class HttpUnloadPhotoFileGateway implements UnloadPhotoFileGateway {
     private static final String BUSINESS_TYPE = "OVERSEAS_UNLOAD_PHOTO";
     @Resource private RestClient.Builder restClientBuilder;
+    @Resource private LastlegRestClientFactory restClientFactory;
+    @Resource private LastlegRestClientProperties restClientProperties;
     @Value("${baiyue.clients.file.url:http://127.0.0.1:9205}") private String baseUrl;
     @Value("${baiyue.security.internal-service-token:}") private String internalToken;
     private RestClient client;
 
     @PostConstruct
-    void initializeClient() { client = restClientBuilder.baseUrl(baseUrl).build(); }
+    void initializeClient() {
+        client = restClientFactory.build(restClientBuilder, baseUrl,
+            restClientProperties.getUnloadPhotoFile());
+    }
 
     @Override
     public UploadedFile upload(String customerId, long taskId, long operatorId, MultipartFile file) {

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/gateway/HttpWarehouseResourceGateway.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.inboundplan.pda.gateway;
 
+import com.baiyue.lastleg.config.LastlegRestClientFactory;
+import com.baiyue.lastleg.config.LastlegRestClientProperties;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatusCode;
@@ -15,6 +17,8 @@ import java.util.Map;
 @Component
 public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
     @Resource private RestClient.Builder restClientBuilder;
+    @Resource private LastlegRestClientFactory restClientFactory;
+    @Resource private LastlegRestClientProperties restClientProperties;
 
     @Value("${baiyue.warehouse.base-url:http://127.0.0.1:9305}")
     private String baseUrl;
@@ -26,7 +30,8 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
 
     @PostConstruct
     void initializeClient() {
-        this.client = restClientBuilder.baseUrl(baseUrl).build();
+        this.client = restClientFactory.build(restClientBuilder, baseUrl,
+            restClientProperties.getWarehouseResource());
     }
 
     @Override

lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGateway.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.palletops.gateway;
 
+import com.baiyue.lastleg.config.LastlegRestClientFactory;
+import com.baiyue.lastleg.config.LastlegRestClientProperties;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,11 +15,16 @@ import java.util.Map;
 @Component
 public class HttpPalletPhysicalGateway implements PalletPhysicalGateway {
     @Resource private RestClient.Builder restClientBuilder;
+    @Resource private LastlegRestClientFactory restClientFactory;
+    @Resource private LastlegRestClientProperties restClientProperties;
     @Value("${baiyue.warehouse.base-url:http://127.0.0.1:9305}") private String baseUrl;
     @Value("${baiyue.security.internal-service-token:}") private String internalToken;
     private RestClient client;
 
-    @PostConstruct void initialize() { client = restClientBuilder.baseUrl(baseUrl).build(); }
+    @PostConstruct void initialize() {
+        client = restClientFactory.build(restClientBuilder, baseUrl,
+            restClientProperties.getPalletPhysical());
+    }
 
     @Override
     public PalletReference resolve(String palletCode) {

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/HttpRelabelPhotoFileGateway.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.relabel.pda.gateway;
 
+import com.baiyue.lastleg.config.LastlegRestClientFactory;
+import com.baiyue.lastleg.config.LastlegRestClientProperties;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,12 +21,17 @@ import java.io.IOException;
 public class HttpRelabelPhotoFileGateway implements RelabelPhotoFileGateway {
     private static final String BUSINESS_TYPE = "OVERSEAS_RELABEL_PHOTO";
     @Resource private RestClient.Builder restClientBuilder;
+    @Resource private LastlegRestClientFactory restClientFactory;
+    @Resource private LastlegRestClientProperties restClientProperties;
     @Value("${baiyue.clients.file.url:http://127.0.0.1:9205}") private String baseUrl;
     @Value("${baiyue.security.internal-service-token:}") private String internalToken;
     private RestClient client;
 
     @PostConstruct
-    void initializeClient() { client = restClientBuilder.baseUrl(baseUrl).build(); }
+    void initializeClient() {
+        client = restClientFactory.build(restClientBuilder, baseUrl,
+            restClientProperties.getRelabelPhotoFile());
+    }
 
     @Override
     public UploadedFile upload(String customerId, long taskId, long operatorId, MultipartFile file) {