Skip to content

Commit f6ae96d

Browse files
optimize: 优化代码
1 parent c329649 commit f6ae96d

2 files changed

Lines changed: 0 additions & 31 deletions

File tree

src/main/java/com/spring/security/common/web/config/CommonWebConfig.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
package com.spring.security.common.web.config;
22

33
import com.spring.security.domain.model.dto.PagedModel;
4-
import java.net.InetSocketAddress;
5-
import java.net.Proxy;
6-
import java.util.Optional;
7-
import org.springframework.boot.context.properties.ConfigurationProperties;
8-
import org.springframework.boot.context.properties.EnableConfigurationProperties;
94
import org.springframework.context.annotation.Bean;
105
import org.springframework.context.annotation.Configuration;
116
import org.springframework.data.domain.Page;
127
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
13-
import org.springframework.http.client.SimpleClientHttpRequestFactory;
14-
import org.springframework.web.client.RestTemplate;
158
import tools.jackson.core.JacksonException;
169
import tools.jackson.core.JsonGenerator;
1710
import tools.jackson.databind.JacksonModule;
@@ -21,27 +14,8 @@
2114

2215
@Configuration
2316
@EnableJpaAuditing
24-
@EnableConfigurationProperties(CommonWebConfig.ProxyProperties.class)
2517
public class CommonWebConfig {
2618

27-
@Bean
28-
public RestTemplate restTemplate(ProxyProperties proxyProperties) {
29-
30-
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
31-
factory.setConnectTimeout(5000);
32-
factory.setReadTimeout(8000);
33-
34-
Optional.of(proxyProperties)
35-
.filter(ProxyProperties::enabled)
36-
.ifPresent(
37-
p -> factory.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(p.host(), p.port()))));
38-
39-
return new RestTemplate(factory);
40-
}
41-
42-
@ConfigurationProperties(prefix = "spring.proxy")
43-
public record ProxyProperties(boolean enabled, String host, int port) {}
44-
4519
@Bean
4620
public JacksonModule jacksonModule() {
4721
SimpleModule simpleModule = new SimpleModule();

src/main/resources/application.properties

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ spring.security.oauth2.client.registration.google.client-name=google
9696
spring.security.oauth2.client.registration.google.client-id=${GOOGLE_CLIENT_ID}
9797
spring.security.oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_SECRET}
9898

99-
# Proxy
100-
spring.proxy.enabled=false
101-
spring.proxy.host=${PROXY_HOST}
102-
spring.proxy.port=${PROXY_PORT}
103-
10499
# Actuator
105100
management.endpoints.web.exposure.include=health,info
106101
management.endpoints.web.base-path=/actuator

0 commit comments

Comments
 (0)