Commit 41a2dab

committed

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

2 parents a316de5 + fd8017b commit 41a2dabCopy full SHA for 41a2dab

File tree

+43

-5

lines changed

+43

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# spring-boot-demo`
`2`		`-![](https://img.shields.io/badge/springboot-2.0.2.RELEAS-blue.svg?color=blue&message=)`
`3`		`-* spring-boot2.0`
	`2`	`+![](https://img.shields.io/badge/springboot-2.1.7.RELEASE-blue.svg?color=blue&message=)`
	`3`	`+* spring-boot 2.0`
`4`	`4`	`* https://shields.io/`
`5`	`5`
`6`	`6`	`# mvn打包测试`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`<name>spring-boot-demo</name>`
`12`	`12`	`<url>https://github.com/netbuffer/spring-boot-demo</url>`
`13`		`- <description>Demo project for Spring Boot</description>`
	`13`	`+ <description>spring-boot 相关技术测试</description>`
`14`	`14`
`15`	`15`	`<developers>`
`16`	`16`	`<developer>`
`@@ -115,6 +115,11 @@`
`115`	`115`	`<artifactId>print-server-address</artifactId>`
`116`	`116`	`<version>2.1.0</version>`
`117`	`117`	`</dependency>`
	`118`	`+ <dependency>`
	`119`	`+ <groupId>com.fasterxml.jackson.dataformat</groupId>`
	`120`	`+ <artifactId>jackson-dataformat-xml</artifactId>`
	`121`	`+ <version>2.10.0</version>`
	`122`	`+ </dependency>`
`118`	`123`	`</dependencies>`
`119`	`124`
`120`	`125`	`<build>`

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,27 @@`
`1`	`1`	`package cn.netbuffer.springbootdemo.config;`
`2`	`2`
`3`	`3`	`import org.springframework.context.annotation.Configuration;`
	`4`	`+import org.springframework.http.MediaType;`
	`5`	`+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;`
	`6`	`+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;`
`4`	`7`
`5`	`8`	`@Configuration`
`6`		`-public class Config {`
	`9`	`+public class Config implements WebMvcConfigurer {`
	`10`	`+`
	`11`	`+ /**`
	`12`	`+ * /bean/map?mt=xml`
	`13`	`+ * /bean/map?mt=json`
	`14`	`+ * @param configurer`
	`15`	`+ */`
	`16`	`+ @Override`
	`17`	`+ public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {`
	`18`	`+ configurer`
	`19`	`+ .favorParameter(true)`
	`20`	`+ .parameterName("mt")`
	`21`	`+ .favorPathExtension(true)`
	`22`	`+// 根据Accept请求头来响应对应的数据格式`
	`23`	`+// .ignoreAcceptHeader(true)`
	`24`	`+ .defaultContentType(MediaType.APPLICATION_JSON);`
	`25`	`+ }`
	`26`	`+`
`7`	`27`	`}`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@`
`18`	`18`	`import javax.annotation.Resource;`
`19`	`19`	`import java.io.IOException;`
`20`	`20`	`import java.util.ArrayList;`
	`21`	`+import java.util.HashMap;`
`21`	`22`	`import java.util.List;`
	`23`	`+import java.util.Map;`
`22`	`24`
`23`	`25`	`@Slf4j`
`24`	`26`	`@RestController`
`@@ -64,4 +66,12 @@ public List getBeanDefinitionNames(@RequestParam("path") String path) throws IOE`
`64`	`66`	`return beanNames;`
`65`	`67`	`}`
`66`	`68`
`67`		`-}`
	`69`	`+ @GetMapping(value = {"map"})`
	`70`	`+ public Map getMap() {`
	`71`	`+ Map data = new HashMap();`
	`72`	`+ data.put("name", "test");`
	`73`	`+ data.put("age", "30");`
	`74`	`+ return data;`
	`75`	`+ }`
	`76`	`+`
	`77`	`+}`

Lines changed: 3 additions & 0 deletions

Comments

(0)