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

This commit is contained in:
wing328
2017-04-27 21:18:52 +08:00
73 changed files with 1019 additions and 780 deletions

View File

@@ -219,8 +219,8 @@ public class SpringCodegen extends AbstractJavaCodegen implements BeanValidation
if (!additionalProperties.containsKey(SINGLE_CONTENT_TYPES)) {
additionalProperties.put(SINGLE_CONTENT_TYPES, "true");
this.setSingleContentTypes(true);
}
additionalProperties.put("useSpringCloudClient", true);
} else {
apiTemplateFiles.put("apiController.mustache", "Controller.java");