优化代码

Yunfeng · Jul 5, 2017 · f65c99d · f65c99d
1 parent 737626f
commit f65c99d
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 388 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,19 +4,19 @@
 
   <groupId>cn.buk.api.wechat</groupId>
   <artifactId>weniu</artifactId>
-  <version>1.2.28-SNAPSHOT</version>
+  <version>1.2.29-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>weniu</name>
-  <url>http://maven.apache.org</url>
 
   <modules>
-        <module>weniu-service</module>
-        <!--<module>weniu-webapp</module>-->
     <module>weniu-dao</module>
-    <module>weniu-util</module>
+    <module>weniu-service</module>
+    <!--<module>weniu-webapp</module>-->
   </modules>
 
+  <url>http://maven.apache.org</url>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <springframework.version>4.3.9.RELEASE</springframework.version>
@@ -60,6 +60,12 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>cn.buk.common</groupId>
+        <artifactId>buk-common-util</artifactId>
+        <version>1.0.15</version>
+      </dependency>
+
       <!--spring -->
       <dependency>
         <groupId>org.springframework</groupId>
@@ -87,11 +93,6 @@
         <artifactId>spring-context</artifactId>
         <version>${springframework.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context-support</artifactId>
-        <version>${springframework.version}</version>
-      </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
@@ -205,13 +206,6 @@
         <version>${httpcore.version}</version>
       </dependency>
 
-      <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>1.9.3</version>
-      </dependency>
-
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
@@ -224,12 +218,6 @@
         <version>3.2.1</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.javassist</groupId>
-        <artifactId>javassist</artifactId>
-        <version>3.19.0-GA</version>
-      </dependency>
-
       <dependency>
         <groupId>org.antlr</groupId>
         <artifactId>antlr</artifactId>
@@ -254,12 +242,6 @@
       </dependency>
 
 
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.4</version>
-      </dependency>
-
       <dependency>
         <groupId>ognl</groupId>
         <artifactId>ognl</artifactId>
@@ -281,44 +263,14 @@
         <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.unitils</groupId>
-        <artifactId>unitils-dbunit</artifactId>
-        <version>3.4.2</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.dbunit</groupId>
-        <artifactId>dbunit</artifactId>
-        <version>${dbunit.verion}</version>
-        <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <artifactId>commons-lang</artifactId>
-            <groupId>commons-lang</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
 
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.2</version>
         <!--<scope>provided</scope>-->
       </dependency>
-      <!-- provided -->
-      <dependency>
-        <groupId>proxool</groupId>
-        <artifactId>proxool</artifactId>
-        <version>0.9.1</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>proxool</groupId>
-        <artifactId>proxool-cglib</artifactId>
-        <version>1.0</version>
-        <scope>provided</scope>
-      </dependency>
+
       <dependency>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
@@ -332,13 +284,6 @@
         <scope>provided</scope>
       </dependency>
 
-      <!--<dependency>-->
-        <!--<groupId>mysql</groupId>-->
-        <!--<artifactId>mysql-connector-java</artifactId>-->
-        <!--<version>5.1.35</version>-->
-        <!--<scope>provided</scope>-->
-      <!--</dependency>-->
-
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>

diff --git a/weniu-dao/pom.xml b/weniu-dao/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>cn.buk.api.wechat</groupId>
     <artifactId>weniu</artifactId>
-    <version>1.2.28-SNAPSHOT</version>
+    <version>1.2.29-SNAPSHOT</version>
   </parent>
 
   <artifactId>weniu-dao</artifactId>
@@ -17,9 +17,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>weniu-util</artifactId>
-      <version>${project.version}</version>
+      <groupId>cn.buk.common</groupId>
+      <artifactId>buk-common-util</artifactId>
     </dependency>
 
     <dependency>

diff --git a/weniu-dao/src/main/java/cn/buk/api/wechat/dao/WeixinDao.java b/weniu-dao/src/main/java/cn/buk/api/wechat/dao/WeixinDao.java
@@ -1,7 +1,7 @@
 package cn.buk.api.wechat.dao;
 
-import cn.buk.api.wechat.dto.CommonSearchCriteria;
 import cn.buk.api.wechat.entity.*;
+import cn.buk.common.CommonSearchCriteria;
 
 import java.util.List;
 

diff --git a/weniu-dao/src/main/java/cn/buk/api/wechat/dao/WeixinDaoImpl.java b/weniu-dao/src/main/java/cn/buk/api/wechat/dao/WeixinDaoImpl.java
@@ -1,8 +1,8 @@
 package cn.buk.api.wechat.dao;
 
-import cn.buk.api.wechat.dto.CommonSearchCriteria;
-import cn.buk.api.wechat.dto.Page;
 import cn.buk.api.wechat.entity.*;
+import cn.buk.common.CommonSearchCriteria;
+import cn.buk.common.Page;
 import cn.buk.util.DateUtil;
 import org.springframework.stereotype.Component;
 
@@ -326,7 +326,7 @@ public List<WeixinMaterial> searchMaterials(int enterpriseId, CommonSearchCriter
 
                 try {
                     results = em.createQuery(cq)
-                            .setFirstResult(page.getFirst())
+                            .setFirstResult(page.getFirstPosition())
                             .setMaxResults(page.getPageSize()).getResultList();
 
                 } catch (Exception ex) {

diff --git a/weniu-dao/src/main/java/cn/buk/api/wechat/dto/AbstractSearchCriteria.java b/weniu-dao/src/main/java/cn/buk/api/wechat/dto/AbstractSearchCriteria.java
diff --git a/weniu-dao/src/main/java/cn/buk/api/wechat/dto/CommonDto.java b/weniu-dao/src/main/java/cn/buk/api/wechat/dto/CommonDto.java
diff --git a/weniu-dao/src/main/java/cn/buk/api/wechat/dto/CommonSearchCriteria.java b/weniu-dao/src/main/java/cn/buk/api/wechat/dto/CommonSearchCriteria.java
diff --git a/weniu-dao/src/main/java/cn/buk/api/wechat/dto/Page.java b/weniu-dao/src/main/java/cn/buk/api/wechat/dto/Page.java