Merge pull request 'dev' (#2) from dev into master
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenter/pulls/2
This commit is contained in:
commit
e89b71de21
|
@ -0,0 +1,24 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<parent>
|
||||||
|
<artifactId>kangarooDataCenter</artifactId>
|
||||||
|
<groupId>com.hzya.frame</groupId>
|
||||||
|
<version>1.0-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<artifactId>webapp</artifactId>
|
||||||
|
<groupId>com.hzya.frame</groupId>
|
||||||
|
<version>1.0-SNAPSHOT</version>
|
||||||
|
<packaging>war</packaging>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.hzya.frame</groupId>
|
||||||
|
<artifactId>application</artifactId>
|
||||||
|
<version>1.0-SNAPSHOT</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
</project>
|
|
@ -23,7 +23,7 @@ public class EntranceController {
|
||||||
@RequestMapping("/queryTest")
|
@RequestMapping("/queryTest")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public String queryTest() {
|
public String queryTest() {
|
||||||
logger.info("请求成功info");
|
logger.info("请求成功info11111111");
|
||||||
logger.error("请求成功error");
|
logger.error("请求成功error");
|
||||||
return "请求成功";
|
return "请求成功";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue