升级jar 同时修复分页bug

pom.xml

@@ -9,6 +9,8 @@
 	<url>http://www.rekoe.com</url>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<nutz.version>1.r.63-SNAPSHOT</nutz.version>
+		<freemarker.version>2.3.26-incubating</freemarker.version>
 	</properties>
 	<repositories>
 		<repository>
@@ -29,7 +31,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.28</version>
+			<version>5.1.44</version>
 		</dependency>
 		<dependency>
 			<groupId>org.tmatesoft.svnkit</groupId>
@@ -39,7 +41,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
-			<version>1.0.24</version>
+			<version>1.1.4</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>jconsole</artifactId>
@@ -54,17 +56,12 @@
 		<dependency>
 			<groupId>org.nutz</groupId>
 			<artifactId>nutz-plugins-views</artifactId>
-			<version>1.r.57</version>
+			<version>${nutz.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.nutz</groupId>
 			<artifactId>nutz</artifactId>
-			<version>	1.r.57.r3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.nutz</groupId>
-			<artifactId>nutz-web</artifactId>
-			<version>1.r.57</version>
+			<version>${nutz.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.restfb</groupId>
@@ -74,7 +71,7 @@
 		<dependency>
 			<groupId>org.freemarker</groupId>
 			<artifactId>freemarker</artifactId>
-			<version>2.3.20</version>
+			<version>${freemarker.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
@@ -100,12 +97,12 @@
 		<dependency>
 			<groupId>org.nutz</groupId>
 			<artifactId>nutz-plugins-daocache</artifactId>
-			<version>	1.r.57</version>
+			<version>${nutz.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.nutz</groupId>
 			<artifactId>nutz-integration-quartz</artifactId>
-			<version>1.r.57.r2</version>
+			<version>${nutz.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
@@ -120,7 +117,7 @@
 		<dependency>
 			<groupId>org.nutz</groupId>
 			<artifactId>nutz-integration-shiro</artifactId>
-			<version>1.r.59</version>
+			<version>${nutz.version}</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>shiro-core</artifactId>
@@ -195,10 +192,15 @@
 		<finalName>rk_svnadmin</finalName>
 		<resources>
 			<resource>
-				<directory>src/main/java</directory>
+				<directory>src/main/resources</directory>
 				<includes>
-					<include>com/rekoe/mvc/*.*</include>
+					<include>**/*.js</include>
+					<include>**/msg/**/*.properties</include>
+					<include>log4j2.xml</include>
 				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/java</directory>
 				<filtering>false</filtering>
 			</resource>
 		</resources>
@@ -234,8 +236,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>

src/main/java/com/rekoe/MainModule.java

@@ -1,6 +1,5 @@
 package com.rekoe;
 
-import org.nutz.mvc.annotation.ChainBy;
 import org.nutz.mvc.annotation.Encoding;
 import org.nutz.mvc.annotation.Fail;
 import org.nutz.mvc.annotation.IocBy;
@@ -8,16 +7,14 @@ import org.nutz.mvc.annotation.Localization;
 import org.nutz.mvc.annotation.Modules;
 import org.nutz.mvc.annotation.SetupBy;
 import org.nutz.mvc.annotation.Views;
-import org.nutz.mvc.impl.NutActionChainMaker;
 import org.nutz.mvc.ioc.provider.ComboIocProvider;
 import org.nutz.plugins.view.freemarker.FreemarkerViewMaker;
 
 @Modules(scanPackage = true, packages = { "com.rekoe.module" })
-@IocBy(type = ComboIocProvider.class, args = { "*json", "/ioc", "*anno", "com.rekoe", "*tx", "*org.nutz.integration.quartz.QuartzIocLoader", "*org.nutz.plugins.view.freemarker.FreemarkerIocLoader", "*async" })
+@IocBy(type = ComboIocProvider.class, args = { "*json", "/ioc", "*anno", "com.rekoe", "*tx", "*quartz", "*org.nutz.plugins.view.freemarker.FreemarkerIocLoader", "*async" })
 @SetupBy(MvcSetup.class)
 @Fail(">>:/admin/common/unauthorized.rk")
 @Encoding(input = "UTF-8", output = "UTF-8")
-@ChainBy(type = NutActionChainMaker.class, args = { "com/rekoe/mvc/mvc-chains.js" })
 @Views({ FreemarkerViewMaker.class })
 @Localization(value = "msg/", defaultLocalizationKey = "zh-CN")
 public class MainModule {

src/main/java/com/rekoe/service/ProjectGroupUsrService.java

@@ -81,7 +81,7 @@ public class ProjectGroupUsrService extends BaseService<PjGrUsr> {
 				return list;
 			}
 		});
-		Long counts = Daos.queryCount(dao(), sql.getSourceSql());
+		Long counts = Daos.queryCount(dao(), sql);
 		pager.setRecordCount(Integer.parseInt(counts.toString()));
 		dao().execute(sql);
 		return new Pagination(page, 20, pager.getRecordCount(), list);

src/main/webapp/WEB-INF/template/admin/project_group/list.ftl

@@ -52,7 +52,7 @@ function deleted(pj,gr){
 	<@p.column title="项目" align="center">${group.pj}</@p.column><#t/>
 	<@p.column title="用户组" align="center">${group.gr}</@p.column><#t/>
 	<@p.column title="描述" align="center">${group.des!}</@p.column><#t/>
-	<@p.column title="设置用户" align="center"><a href="${base}/admin/project/group/usr/list?pageNumber=1&pj=${group.pj}&gr=${group.gr}">设置用户</a></@p.column><#t/>
+	<@p.column title="设置用户" align="center"><a href="${base}/admin/project/group/usr/list?pj=${group.pj}&gr=${group.gr}">设置用户</a></@p.column><#t/>
 	<@shiro.hasPermission name="project.group:delete">	
 	<@p.column title="删除" align="center">
 		<#if group.gr != "manager"><a href="javascript:void(0);" onclick="deleted('${group.pj}','${group.gr}')" class="pn-opt">删除</a></#if><#rt/>