Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修改bug #494

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修改bug #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions examples/quickstart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@
<java.version>1.6</java.version>

<!-- 项目属性 -->
<!--
<jdbc.driver.groupId>com.h2database</jdbc.driver.groupId>
<jdbc.driver.artifactId>h2</jdbc.driver.artifactId>
<jdbc.driver.version>${h2.version}</jdbc.driver.version>
<!--
<jdbc.driver.groupId>mysql</jdbc.driver.groupId>
<jdbc.driver.artifactId>mysql-connector-java</jdbc.driver.artifactId>
<jdbc.driver.version>5.1.22</jdbc.driver.version>
-->
-->

<jdbc.driver.groupId>mysql</jdbc.driver.groupId>
<jdbc.driver.artifactId>mysql-connector-java</jdbc.driver.artifactId>
<jdbc.driver.version>5.1.22</jdbc.driver.version>

</properties>

<prerequisites>
Expand Down
16 changes: 8 additions & 8 deletions examples/quickstart/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#h2 database settings
jdbc.driver=org.h2.Driver
jdbc.url=jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
jdbc.username=sa
jdbc.password=
#jdbc.driver=org.h2.Driver
#jdbc.url=jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
#jdbc.username=sa
#jdbc.password=

#log4jdbc driver
#jdbc.driver=net.sf.log4jdbc.DriverSpy
Expand All @@ -15,10 +15,10 @@ jdbc.password=
#jdbc.password=quickstart

#mysql database setting
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc:mysql://localhost/quickstart?useUnicode=true&characterEncoding=utf-8
#jdbc.username=root
#jdbc.password=
jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8
jdbc.username=root
jdbc.password=123

#connection pool settings
jdbc.pool.maxIdle=10
Expand Down
4 changes: 2 additions & 2 deletions examples/quickstart/src/main/webapp/WEB-INF/tags/pagination.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ request.setAttribute("end", end);

<div class="pagination">
<ul>
<% if (page.hasPreviousPage()){%>
<% if (page.hasPrevious()){%>
<li><a href="?page=1&sortType=${sortType}&${searchParams}">&lt;&lt;</a></li>
<li><a href="?page=${current-1}&sortType=${sortType}&${searchParams}">&lt;</a></li>
<%}else{%>
Expand All @@ -35,7 +35,7 @@ request.setAttribute("end", end);
</c:choose>
</c:forEach>

<% if (page.hasNextPage()){%>
<% if (page.hasNext()){%>
<li><a href="?page=${current+1}&sortType=${sortType}&${searchParams}">&gt;</a></li>
<li><a href="?page=${page.totalPages}&sortType=${sortType}&${searchParams}">&gt;&gt;</a></li>
<%}else{%>
Expand Down