Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-03-30 09:57:07 +08:00
125 changed files with 164 additions and 158 deletions

View File

@@ -26,7 +26,7 @@ public class ApiClient {
public interface Api {}
protected ObjectMapper objectMapper;
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private Map<String, RequestInterceptor> apiAuthorizations;
private Feign.Builder feignBuilder;

View File

@@ -29,7 +29,7 @@ public class PetApiTest {
@Test
public void testApiClient() {
// the default api client is used
assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
ApiClient newClient = new ApiClient();
newClient.setBasePath("http://example.com");