diff --git a/src/main/java/com/dengqn/app/lingyinapi/config/HttpClientConfig.java b/src/main/java/com/dengqn/app/lingyinapi/config/HttpClientConfig.java index 9670aaa..94a4a1d 100644 --- a/src/main/java/com/dengqn/app/lingyinapi/config/HttpClientConfig.java +++ b/src/main/java/com/dengqn/app/lingyinapi/config/HttpClientConfig.java @@ -5,13 +5,9 @@ import okhttp3.*; import org.jetbrains.annotations.NotNull; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; -import javax.net.ssl.SSLEngine; -import javax.net.ssl.X509ExtendedTrustManager; import java.io.IOException; -import java.net.Socket; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.List; @@ -27,9 +23,11 @@ import java.util.Optional; public class HttpClientConfig { private CookieConfig cookieConfig; + private final Environment environment; - public HttpClientConfig(CookieConfig cookieConfig) { + public HttpClientConfig(CookieConfig cookieConfig, Environment environment) { this.cookieConfig = cookieConfig; + this.environment = environment; } @Bean @@ -44,10 +42,15 @@ public class HttpClientConfig { @NotNull @Override public List loadForRequest(@NotNull HttpUrl httpUrl) { + + String login = environment.getProperty("SECURE_LOGIN", cookieConfig.getSecureLogin()); + String uid = environment.getProperty("SECURE_UID", cookieConfig.getSecureUid()); + String pass = environment.getProperty("SECURE_PASS", cookieConfig.getSecurePass()); + return List.of( - new Cookie.Builder().domain("pt.soulvoice.club").name("c_secure_login").value(cookieConfig.getSecureLogin()).build(), - new Cookie.Builder().domain("pt.soulvoice.club").name("c_secure_uid").value(cookieConfig.getSecureUid()).build(), - new Cookie.Builder().domain("pt.soulvoice.club").name("c_secure_pass").value(cookieConfig.getSecurePass()).build() + new Cookie.Builder().domain("pt.soulvoice.club").name("c_secure_login").value(login).build(), + new Cookie.Builder().domain("pt.soulvoice.club").name("c_secure_uid").value(uid).build(), + new Cookie.Builder().domain("pt.soulvoice.club").name("c_secure_pass").value(pass).build() ); } })