diff --git a/pom.xml b/pom.xml index 3a36075..5f8836f 100644 --- a/pom.xml +++ b/pom.xml @@ -142,11 +142,6 @@ querydsl-apt ${querydsl.version} - - org.mitre.dsmiley.httpproxy - smiley-http-proxy-servlet - 1.12.1 - diff --git a/src/main/java/com/xydl/cac/config/SolrProxyServletConfiguration.java b/src/main/java/com/xydl/cac/config/SolrProxyServletConfiguration.java deleted file mode 100644 index d108b19..0000000 --- a/src/main/java/com/xydl/cac/config/SolrProxyServletConfiguration.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.xydl.cac.config; - -import org.mitre.dsmiley.httpproxy.ProxyServlet; -import org.springframework.boot.context.properties.bind.BindResult; -import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.web.servlet.ServletRegistrationBean; -import org.springframework.context.EnvironmentAware; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; - -import java.util.Properties; - -@Configuration -public class SolrProxyServletConfiguration implements EnvironmentAware { - - @Bean - public ServletRegistrationBean servletRegistrationBean() { - Properties properties = (Properties) bindResult.get(); - ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new ProxyServlet(), properties.getProperty("servlet_url")); - servletRegistrationBean.addInitParameter(ProxyServlet.P_TARGET_URI, properties.getProperty("target_url")); - servletRegistrationBean.addInitParameter(ProxyServlet.P_LOG, properties.getProperty("logging_enabled", "false")); - return servletRegistrationBean; - } - - private BindResult bindResult; - - @Override - public void setEnvironment(Environment environment) { - Iterable sources = ConfigurationPropertySources.get(environment); - Binder binder = new Binder(sources); - BindResult bindResult = binder.bind("proxy.solr", Properties.class); - this.bindResult = bindResult; - } -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e4eaf51..c801fcc 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -25,10 +25,5 @@ spring: max-file-size: 100MB max-request-size: 100MB -proxy: - solr: - servlet_url: /prod-api/* - target_url: http://127.0.0.1:8082/ - cac: rsakey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index c592d2b..b2dbf20 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -25,10 +25,5 @@ spring: max-file-size: 100MB max-request-size: 100MB -proxy: - solr: - servlet_url: /prod-api/* - target_url: http://127.0.0.1:8082/ - cac: rsakey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=