From 3473233334e5ce88158ceb4cbf190a37a7b8f8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=AE=E7=81=B0?= <sagittar_zhang@126.com>
Date: Sat, 1 Jul 2017 19:59:14 +0800
Subject: [PATCH 1/3] Advanced

---
 pom.xml                                       |  2 +-
 .../cn/guet/tourism/base/BaseController.java  |  6 +++
 .../tourism/controller/GoodsController.java   | 16 ++++++++
 .../java/cn/guet/tourism/entity/Goods.java    | 39 +++++++++++++++++++
 .../guet/tourism/mapper/xml/GoodsMapper.xml   |  3 ++
 src/main/resources/static/js/front.js         |  2 +-
 src/main/resources/templates/index.html       |  4 +-
 .../tourism/TourismApplicationBaseTest.java   |  3 ++
 8 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4af865b..f24593b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
 
-		<!-- mybatis -->
+		<!-- mybatis-plus -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatisplus-spring-boot-starter</artifactId>
diff --git a/src/main/java/cn/guet/tourism/base/BaseController.java b/src/main/java/cn/guet/tourism/base/BaseController.java
index b2ce3d8..bcfcf03 100644
--- a/src/main/java/cn/guet/tourism/base/BaseController.java
+++ b/src/main/java/cn/guet/tourism/base/BaseController.java
@@ -3,6 +3,7 @@ package cn.guet.tourism.base;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * 基础Controller
@@ -26,4 +27,9 @@ public class BaseController<S extends IBaseService<T>, T extends AModel<T>> {
 	protected String redirectTo(String newUrl) {
 		return "redirect:".concat(newUrl);
 	}
+
+	@RequestMapping(value = "index")
+	public String index() {
+		return "index";
+	}
 }
diff --git a/src/main/java/cn/guet/tourism/controller/GoodsController.java b/src/main/java/cn/guet/tourism/controller/GoodsController.java
index ff7c595..70fb17b 100644
--- a/src/main/java/cn/guet/tourism/controller/GoodsController.java
+++ b/src/main/java/cn/guet/tourism/controller/GoodsController.java
@@ -1,6 +1,10 @@
 package cn.guet.tourism.controller;
 
 import org.springframework.stereotype.Controller;
+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 +15,16 @@ import cn.guet.tourism.service.IGoodsService;
  */
 @Controller
 public class GoodsController extends BaseController<IGoodsService, Goods> {
+
+	@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 param;
+	}
 }
diff --git a/src/main/java/cn/guet/tourism/entity/Goods.java b/src/main/java/cn/guet/tourism/entity/Goods.java
index 8299f3e..0b43459 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<Goods> 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 cd9600d..39bb218 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 @@
 	<!-- 通用查询映射结果 -->
 	<resultMap id="BaseResultMap" type="Goods">
 		<id column="id" property="id" />
+		<result column="name" property="name" />
+		<result column="url" property="url" />
+		<result column="sales_price" property="salesPrice" />
 	</resultMap>
 </mapper>
diff --git a/src/main/resources/static/js/front.js b/src/main/resources/static/js/front.js
index c063a97..6a70cf1 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 9939b72..0dfe488 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -2,14 +2,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
 <head>
 	<title>Boot Page</title>
-	<script th:src="@{http://code.jquery.com/jquery-3.2.1.js}"></script>
+	<script th:src="@{http://code.jquery.com/jquery-3.2.1.js}" src="http://code.jquery.com/jquery-3.2.1.js"></script>
 	<script th:src="@{js/front.js}" src="../static/js/front.js"></script>
 	<link rel="stylesheet" th:href="@{css/style.css}" href="../static/css/style.css" />
 </head>
 <body>
 <div>
 	<img src="../static/image/guet.jpg" th:src="@{image/guet.jpg}" alt="桂林电子科技大学" />
-	<button th:utext="${key}" class="color" value="onclick"></button>
+	<button th:utext="${key}" class="color">Offline</button>
 </div>
 </body>
 </html>
diff --git a/src/test/java/cn/guet/tourism/TourismApplicationBaseTest.java b/src/test/java/cn/guet/tourism/TourismApplicationBaseTest.java
index 4ef82df..40f0de5 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 {
-- 
Gitee


From 74b99e2f5ae4935d5d92ada0e1a1b07bd73caa1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=AE=E7=81=B0?= <sagittar_zhang@126.com>
Date: Sun, 2 Jul 2017 13:48:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                    | 3 +--
 src/main/java/cn/guet/tourism/base/BaseController.java     | 6 ------
 .../java/cn/guet/tourism/controller/GoodsController.java   | 7 +++++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f24593b..637d365 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?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">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>cn.guet</groupId>
@@ -80,7 +80,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
-			<scope>provided</scope>
 		</dependency>
 
 		<!-- DataSource -->
diff --git a/src/main/java/cn/guet/tourism/base/BaseController.java b/src/main/java/cn/guet/tourism/base/BaseController.java
index bcfcf03..b2ce3d8 100644
--- a/src/main/java/cn/guet/tourism/base/BaseController.java
+++ b/src/main/java/cn/guet/tourism/base/BaseController.java
@@ -3,7 +3,6 @@ package cn.guet.tourism.base;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * 基础Controller
@@ -27,9 +26,4 @@ public class BaseController<S extends IBaseService<T>, T extends AModel<T>> {
 	protected String redirectTo(String newUrl) {
 		return "redirect:".concat(newUrl);
 	}
-
-	@RequestMapping(value = "index")
-	public String index() {
-		return "index";
-	}
 }
diff --git a/src/main/java/cn/guet/tourism/controller/GoodsController.java b/src/main/java/cn/guet/tourism/controller/GoodsController.java
index 70fb17b..e48d233 100644
--- a/src/main/java/cn/guet/tourism/controller/GoodsController.java
+++ b/src/main/java/cn/guet/tourism/controller/GoodsController.java
@@ -1,6 +1,7 @@
 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;
@@ -27,4 +28,10 @@ public class GoodsController extends BaseController<IGoodsService, Goods> {
 	public String to(@RequestParam(value = "111") String param) {
 		return param;
 	}
+
+	@RequestMapping(value = "index")
+	public String index(Model model) {
+		model.addAttribute("key", GoodsController.class.getSimpleName());
+		return "index";
+	}
 }
-- 
Gitee


From fa846b260517a57a0c6b52c7790a139ff3aab95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=AE=E7=81=B0?= <sagittar_zhang@126.com>
Date: Sun, 2 Jul 2017 16:08:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guet/tourism/controller/GoodsController.java |   2 +-
 src/main/resources/static/image/favicon.ico      | Bin 0 -> 4286 bytes
 src/main/resources/templates/index.html          |   1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/static/image/favicon.ico

diff --git a/src/main/java/cn/guet/tourism/controller/GoodsController.java b/src/main/java/cn/guet/tourism/controller/GoodsController.java
index e48d233..cdabc98 100644
--- a/src/main/java/cn/guet/tourism/controller/GoodsController.java
+++ b/src/main/java/cn/guet/tourism/controller/GoodsController.java
@@ -26,7 +26,7 @@ public class GoodsController extends BaseController<IGoodsService, Goods> {
 	@ResponseBody
 	@RequestMapping(value = "/to")
 	public String to(@RequestParam(value = "111") String param) {
-		return param;
+		return String.format("{\"value\": \"%s\"}", param);
 	}
 
 	@RequestMapping(value = "index")
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
GIT binary patch
literal 4286
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
X^Bd(GP_FM5U-_aT_5T3>ujhXOgRv{4

literal 0
HcmV?d00001

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 0dfe488..e3fe99b 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -5,6 +5,7 @@
 	<script th:src="@{http://code.jquery.com/jquery-3.2.1.js}" src="http://code.jquery.com/jquery-3.2.1.js"></script>
 	<script th:src="@{js/front.js}" src="../static/js/front.js"></script>
 	<link rel="stylesheet" th:href="@{css/style.css}" href="../static/css/style.css" />
+	<link rel="icon" href="../static/image/favicon.ico" th:href="@{image/favicon.ico}" />
 </head>
 <body>
 <div>
-- 
Gitee