FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2

Browse Source 
 Conflicts:
	adc-da-main/src/main/resources/application-dev.properties
This commit is contained in:
root
2021-07-04 16:48:26 +08:00
parent 1f9f5ac2fa 531bb9e7ce
commit 9e97c80c5e
10 changed files with 246 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java
+1
View File
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.web.client.RestTemplate;