更新到最新版本，spring boot 2.0, mapper 1.2.4, pagehelper 1.2.3

abel533 · abel533 · commit 4b665cd7e660 · 2018-03-07T05:50:41.000+08:00
diff --git a/README.md b/README.md
@@ -27,13 +27,13 @@ GitHub项目：https://github.com/mybatis-book/book
 <dependency>
     <groupId>tk.mybatis</groupId>
     <artifactId>mapper-spring-boot-starter</artifactId>
-    <version>1.1.4</version>
+    <version>1.2.4</version>
 </dependency>
 <!--pagehelper-->
 <dependency>
     <groupId>com.github.pagehelper</groupId>
     <artifactId>pagehelper-spring-boot-starter</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.3</version>
 </dependency>
 ```
 ## Spring DevTools 配置
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.6.RELEASE</version>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <properties>
@@ -74,17 +74,30 @@
             <version>1.0.11</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+
         <!--mapper-->
         <dependency>
             <groupId>tk.mybatis</groupId>
             <artifactId>mapper-spring-boot-starter</artifactId>
-            <version>1.2.0</version>
+            <!--<version>1.2.0</version>-->
+            <version>1.2.4</version>
         </dependency>
         <!--pagehelper-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>RELEASE</version>
+            <version>1.2.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis.spring.boot</groupId>
+                    <artifactId>mybatis-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl
@@ -129,12 +129,12 @@
             <tbody>
                 <#list pageInfo.list as country>
                 <tr>
-                    <td>${country.id}</td>
+                    <td>${country.id?c}</td>
                     <td>${country.countryname}</td>
                     <td>${country.countrycode}</td>
                     <td style="text-align:center;">[<a
-                            href="${request.contextPath}/countries/view/${country.id}">修改</a>] -
-                        [<a href="${request.contextPath}/countries/delete/${country.id}">删除</a>]
+                            href="${request.contextPath}/countries/view/${country.id?c}">修改</a>] -
+                        [<a href="${request.contextPath}/countries/delete/${country.id?c}">删除</a>]
                     </td>
                 </tr>
                 </#list>
diff --git a/src/main/resources/templates/view.ftl b/src/main/resources/templates/view.ftl
@@ -5,7 +5,7 @@
 </head>
 <body style="margin-top:50px;overflow: hidden;">
 <form action="${request.contextPath}/countries/save" method="post">
-    <input type="hidden" name="id" value="<#if country.id??>${country.id}</#if>"/>
+    <input type="hidden" name="id" value="<#if country.id??>${country.id?c}</#if>"/>
     <table class="gridtable" style="width:800px;">
         <tr>
             <th colspan="5">国家(地区)信息 - [<a href="${request.contextPath}/countries">返回</a>]</th>
