diff --git a/pom.xml b/pom.xml index 4af865b0f9f3d37c3be343354acdc6918dd4b489..637d365a2044c4a2212686699cb7eacfb1b6d1fe 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 cn.guet @@ -80,7 +80,6 @@ org.springframework.boot spring-boot-starter-tomcat - provided @@ -93,7 +92,7 @@ mysql-connector-java - + com.baomidou mybatisplus-spring-boot-starter diff --git a/src/main/java/cn/guet/tourism/controller/GoodsController.java b/src/main/java/cn/guet/tourism/controller/GoodsController.java index ff7c59504224f6acbac75606c12c6b53fdf3ceb1..cdabc98be6f362172a52565a7b982f5d3618844c 100644 --- a/src/main/java/cn/guet/tourism/controller/GoodsController.java +++ b/src/main/java/cn/guet/tourism/controller/GoodsController.java @@ -1,6 +1,11 @@ package cn.guet.tourism.controller; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import cn.guet.tourism.base.BaseController; import cn.guet.tourism.entity.Goods; @@ -11,4 +16,22 @@ import cn.guet.tourism.service.IGoodsService; */ @Controller public class GoodsController extends BaseController { + + @RequestMapping(value = "/from") + public String from(RedirectAttributes attributes) { + attributes.addAttribute("111", "222"); + return redirectTo("to"); + } + + @ResponseBody + @RequestMapping(value = "/to") + public String to(@RequestParam(value = "111") String param) { + return String.format("{\"value\": \"%s\"}", param); + } + + @RequestMapping(value = "index") + public String index(Model model) { + model.addAttribute("key", GoodsController.class.getSimpleName()); + return "index"; + } } diff --git a/src/main/java/cn/guet/tourism/entity/Goods.java b/src/main/java/cn/guet/tourism/entity/Goods.java index 8299f3e82e168a5dd1f76782509cd46bd1abcd3c..0b43459fb4d21d888aa3c6899dc117c2bcff5546 100644 --- a/src/main/java/cn/guet/tourism/entity/Goods.java +++ b/src/main/java/cn/guet/tourism/entity/Goods.java @@ -2,6 +2,7 @@ package cn.guet.tourism.entity; import org.apache.ibatis.type.Alias; +import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import cn.guet.tourism.base.AModel; @@ -14,4 +15,42 @@ import cn.guet.tourism.base.AModel; public class Goods extends AModel implements Cloneable { private static final long serialVersionUID = -593477885707186656L; + + @TableField(value = "name") + private String name; + + @TableField(value = "url") + private String url; + + @TableField(value = "sales_price") + private Float salesPrice; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public Float getSalesPrice() { + return salesPrice; + } + + public void setSalesPrice(Float salesPrice) { + this.salesPrice = salesPrice; + } + + @Override + public Goods clone() throws CloneNotSupportedException { + return (Goods) super.clone(); + } } diff --git a/src/main/java/cn/guet/tourism/mapper/xml/GoodsMapper.xml b/src/main/java/cn/guet/tourism/mapper/xml/GoodsMapper.xml index cd9600db3b6f03e56825a589ea0afad998ce35ba..39bb218c4967cac26446f0836dbe53dd151c2b75 100644 --- a/src/main/java/cn/guet/tourism/mapper/xml/GoodsMapper.xml +++ b/src/main/java/cn/guet/tourism/mapper/xml/GoodsMapper.xml @@ -5,5 +5,8 @@ + + + diff --git a/src/main/resources/static/image/favicon.ico b/src/main/resources/static/image/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..621c3d9389cab388ac77faa9543cd90699efb4e5 Binary files /dev/null and b/src/main/resources/static/image/favicon.ico differ diff --git a/src/main/resources/static/js/front.js b/src/main/resources/static/js/front.js index c063a976c31d674f4136bcc6526efb7b1d7c0b4a..6a70cf142b81f6b6a3c656d8ab2a88e3f2280359 100644 --- a/src/main/resources/static/js/front.js +++ b/src/main/resources/static/js/front.js @@ -4,4 +4,4 @@ $(function () { alert(data + "\r\n" + status); }); }); -}) +}); diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 9939b7221ea0e7f85c0cad702fa82ae30825a9f0..e3fe99b09562ff60bf987ff27c2d23caf28b87bd 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -2,14 +2,15 @@ Boot Page - + +
桂林电子科技大学 - +
diff --git a/src/test/java/cn/guet/tourism/TourismApplicationBaseTest.java b/src/test/java/cn/guet/tourism/TourismApplicationBaseTest.java index 4ef82df7682790a6ed074d972be9b01955856788..40f0de577a04e79f5004142d95edefc15fa320bf 100644 --- a/src/test/java/cn/guet/tourism/TourismApplicationBaseTest.java +++ b/src/test/java/cn/guet/tourism/TourismApplicationBaseTest.java @@ -4,6 +4,9 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +/** + * 基础测试类,单元测试继承该类 + */ @RunWith(SpringRunner.class) @SpringBootTest public class TourismApplicationBaseTest {