Merge branch 'v1.0.0'

# Conflicts:
#	pom.xml

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.xinchen</groupId>
     <artifactId>demo</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>3.0-RELEASE</version>
 
     <dependencies>
         <dependency>
@@ -32,14 +32,5 @@
             </plugin>
         </plugins>
     </build>
-    <distributionManagement>
-        <repository>
-            <id>central</id>
-            <url>http://192.168.0.110:18082/artifactory/demo-local-release/</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshots</id>
-            <url>http://192.168.0.110:18082/artifactory/demo-local-snapshot/</url>
-        </snapshotRepository>
-    </distributionManagement>
+
 </project>
\ No newline at end of file

src/main/java/com/xinchen/controller/TestController.java

@@ -23,8 +23,8 @@ public class TestController {
     @GetMapping("/getUserInfo")
     public Map getUserInfo() {
         Map<String, Object> map = new HashMap<>();
-        map.put("username", "dabai12");
-        map.put("age", 30);
+        map.put("username", "晓明");
+        map.put("age", 25);
         return map;
     }
 }