generatorConfig.xml改为默认会使用classpath下驱动包

zheng-cms/zheng-cms-dao/src/main/resources/generatorConfig.xml

@@ -5,9 +5,6 @@
     <!-- 配置文件 -->
     <properties resource="jdbc.properties"></properties>
 
-    <!-- mysql驱动包 -->
-    <classPathEntry location="${classPathEntry}" />
-
     <context id="MysqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>

zheng-cms/zheng-cms-dao/src/main/resources/jdbc.properties

@@ -1,6 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
 jdbc.username=root
-jdbc.password=123456
-
-classPathEntry=D:/mysql-connector-java-5.1.34.jar
+jdbc.password=123456

zheng-common/src/main/resources/generatorConfig.vm

@@ -5,9 +5,6 @@
     <!-- 配置文件 -->
     <properties resource="jdbc.properties"></properties>
 
-    <!-- mysql驱动包 -->
-    <classPathEntry location="${classPathEntry}" />
-
     <context id="MysqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>

zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/mapper/PayInOrderMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.zheng.pay.dao.mapper.PayInOrderMapper">
   <resultMap id="BaseResultMap" type="com.zheng.pay.dao.model.PayInOrder">
     <id column="pay_in_order_id" jdbcType="INTEGER" property="payInOrderId" />
-    <result column="pay_mch_id" jdbcType="INTEGER" property="payMchId" />
     <result column="pay_vendor_id" jdbcType="INTEGER" property="payVendorId" />
+    <result column="pay_mch_id" jdbcType="INTEGER" property="payMchId" />
     <result column="amount" jdbcType="DECIMAL" property="amount" />
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
@@ -68,7 +68,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    pay_in_order_id, pay_mch_id, pay_vendor_id, amount, status, ctime
+    pay_in_order_id, pay_vendor_id, pay_mch_id, amount, status, ctime
   </sql>
   <select id="selectByExample" parameterType="com.zheng.pay.dao.model.PayInOrderExample" resultMap="BaseResultMap">
     select
@@ -109,10 +109,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.pay.dao.model.PayInOrder">
-    insert into pay_in_order (pay_in_order_id, pay_mch_id, pay_vendor_id, 
+    insert into pay_in_order (pay_in_order_id, pay_vendor_id, pay_mch_id, 
       amount, status, ctime
       )
-    values (#{payInOrderId,jdbcType=INTEGER}, #{payMchId,jdbcType=INTEGER}, #{payVendorId,jdbcType=INTEGER}, 
+    values (#{payInOrderId,jdbcType=INTEGER}, #{payVendorId,jdbcType=INTEGER}, #{payMchId,jdbcType=INTEGER}, 
       #{amount,jdbcType=DECIMAL}, #{status,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT}
       )
   </insert>
@@ -122,12 +122,12 @@
       <if test="payInOrderId != null">
         pay_in_order_id,
       </if>
-      <if test="payMchId != null">
-        pay_mch_id,
-      </if>
       <if test="payVendorId != null">
         pay_vendor_id,
       </if>
+      <if test="payMchId != null">
+        pay_mch_id,
+      </if>
       <if test="amount != null">
         amount,
       </if>
@@ -142,12 +142,12 @@
       <if test="payInOrderId != null">
         #{payInOrderId,jdbcType=INTEGER},
       </if>
-      <if test="payMchId != null">
-        #{payMchId,jdbcType=INTEGER},
-      </if>
       <if test="payVendorId != null">
         #{payVendorId,jdbcType=INTEGER},
       </if>
+      <if test="payMchId != null">
+        #{payMchId,jdbcType=INTEGER},
+      </if>
       <if test="amount != null">
         #{amount,jdbcType=DECIMAL},
       </if>
@@ -171,12 +171,12 @@
       <if test="record.payInOrderId != null">
         pay_in_order_id = #{record.payInOrderId,jdbcType=INTEGER},
       </if>
-      <if test="record.payMchId != null">
-        pay_mch_id = #{record.payMchId,jdbcType=INTEGER},
-      </if>
       <if test="record.payVendorId != null">
         pay_vendor_id = #{record.payVendorId,jdbcType=INTEGER},
       </if>
+      <if test="record.payMchId != null">
+        pay_mch_id = #{record.payMchId,jdbcType=INTEGER},
+      </if>
       <if test="record.amount != null">
         amount = #{record.amount,jdbcType=DECIMAL},
       </if>
@@ -194,8 +194,8 @@
   <update id="updateByExample" parameterType="map">
     update pay_in_order
     set pay_in_order_id = #{record.payInOrderId,jdbcType=INTEGER},
-      pay_mch_id = #{record.payMchId,jdbcType=INTEGER},
       pay_vendor_id = #{record.payVendorId,jdbcType=INTEGER},
+      pay_mch_id = #{record.payMchId,jdbcType=INTEGER},
       amount = #{record.amount,jdbcType=DECIMAL},
       status = #{record.status,jdbcType=TINYINT},
       ctime = #{record.ctime,jdbcType=BIGINT}
@@ -206,12 +206,12 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.zheng.pay.dao.model.PayInOrder">
     update pay_in_order
     <set>
-      <if test="payMchId != null">
-        pay_mch_id = #{payMchId,jdbcType=INTEGER},
-      </if>
       <if test="payVendorId != null">
         pay_vendor_id = #{payVendorId,jdbcType=INTEGER},
       </if>
+      <if test="payMchId != null">
+        pay_mch_id = #{payMchId,jdbcType=INTEGER},
+      </if>
       <if test="amount != null">
         amount = #{amount,jdbcType=DECIMAL},
       </if>
@@ -226,8 +226,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.zheng.pay.dao.model.PayInOrder">
     update pay_in_order
-    set pay_mch_id = #{payMchId,jdbcType=INTEGER},
-      pay_vendor_id = #{payVendorId,jdbcType=INTEGER},
+    set pay_vendor_id = #{payVendorId,jdbcType=INTEGER},
+      pay_mch_id = #{payMchId,jdbcType=INTEGER},
       amount = #{amount,jdbcType=DECIMAL},
       status = #{status,jdbcType=TINYINT},
       ctime = #{ctime,jdbcType=BIGINT}

zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/mapper/PayTypeMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.zheng.pay.dao.mapper.PayTypeMapper">
   <resultMap id="BaseResultMap" type="com.zheng.pay.dao.model.PayType">
     <id column="pay_type_id" jdbcType="INTEGER" property="payTypeId" />
-    <result column="pay_mch_id" jdbcType="INTEGER" property="payMchId" />
     <result column="pay_vendor_id" jdbcType="INTEGER" property="payVendorId" />
+    <result column="pay_mch_id" jdbcType="INTEGER" property="payMchId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -65,7 +65,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    pay_type_id, pay_mch_id, pay_vendor_id
+    pay_type_id, pay_vendor_id, pay_mch_id
   </sql>
   <select id="selectByExample" parameterType="com.zheng.pay.dao.model.PayTypeExample" resultMap="BaseResultMap">
     select
@@ -106,9 +106,9 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.pay.dao.model.PayType">
-    insert into pay_type (pay_type_id, pay_mch_id, pay_vendor_id
+    insert into pay_type (pay_type_id, pay_vendor_id, pay_mch_id
       )
-    values (#{payTypeId,jdbcType=INTEGER}, #{payMchId,jdbcType=INTEGER}, #{payVendorId,jdbcType=INTEGER}
+    values (#{payTypeId,jdbcType=INTEGER}, #{payVendorId,jdbcType=INTEGER}, #{payMchId,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.pay.dao.model.PayType">
@@ -117,23 +117,23 @@
       <if test="payTypeId != null">
         pay_type_id,
       </if>
-      <if test="payMchId != null">
-        pay_mch_id,
-      </if>
       <if test="payVendorId != null">
         pay_vendor_id,
       </if>
+      <if test="payMchId != null">
+        pay_mch_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="payTypeId != null">
         #{payTypeId,jdbcType=INTEGER},
       </if>
-      <if test="payMchId != null">
-        #{payMchId,jdbcType=INTEGER},
-      </if>
       <if test="payVendorId != null">
         #{payVendorId,jdbcType=INTEGER},
       </if>
+      <if test="payMchId != null">
+        #{payMchId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.zheng.pay.dao.model.PayTypeExample" resultType="java.lang.Long">
@@ -148,12 +148,12 @@
       <if test="record.payTypeId != null">
         pay_type_id = #{record.payTypeId,jdbcType=INTEGER},
       </if>
-      <if test="record.payMchId != null">
-        pay_mch_id = #{record.payMchId,jdbcType=INTEGER},
-      </if>
       <if test="record.payVendorId != null">
         pay_vendor_id = #{record.payVendorId,jdbcType=INTEGER},
       </if>
+      <if test="record.payMchId != null">
+        pay_mch_id = #{record.payMchId,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -162,8 +162,8 @@
   <update id="updateByExample" parameterType="map">
     update pay_type
     set pay_type_id = #{record.payTypeId,jdbcType=INTEGER},
-      pay_mch_id = #{record.payMchId,jdbcType=INTEGER},
-      pay_vendor_id = #{record.payVendorId,jdbcType=INTEGER}
+      pay_vendor_id = #{record.payVendorId,jdbcType=INTEGER},
+      pay_mch_id = #{record.payMchId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -171,19 +171,19 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.zheng.pay.dao.model.PayType">
     update pay_type
     <set>
-      <if test="payMchId != null">
-        pay_mch_id = #{payMchId,jdbcType=INTEGER},
-      </if>
       <if test="payVendorId != null">
         pay_vendor_id = #{payVendorId,jdbcType=INTEGER},
       </if>
+      <if test="payMchId != null">
+        pay_mch_id = #{payMchId,jdbcType=INTEGER},
+      </if>
     </set>
     where pay_type_id = #{payTypeId,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.zheng.pay.dao.model.PayType">
     update pay_type
-    set pay_mch_id = #{payMchId,jdbcType=INTEGER},
-      pay_vendor_id = #{payVendorId,jdbcType=INTEGER}
+    set pay_vendor_id = #{payVendorId,jdbcType=INTEGER},
+      pay_mch_id = #{payMchId,jdbcType=INTEGER}
     where pay_type_id = #{payTypeId,jdbcType=INTEGER}
   </update>
   <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />

zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/model/PayInOrder.java

@@ -5,10 +5,10 @@ import java.io.Serializable;
 public class PayInOrder implements Serializable {
     private Integer payInOrderId;
 
-    private Integer payMchId;
-
     private Integer payVendorId;
 
+    private Integer payMchId;
+
     private Long amount;
 
     private Byte status;
@@ -25,14 +25,6 @@ public class PayInOrder implements Serializable {
         this.payInOrderId = payInOrderId;
     }
 
-    public Integer getPayMchId() {
-        return payMchId;
-    }
-
-    public void setPayMchId(Integer payMchId) {
-        this.payMchId = payMchId;
-    }
-
     public Integer getPayVendorId() {
         return payVendorId;
     }
@@ -41,6 +33,14 @@ public class PayInOrder implements Serializable {
         this.payVendorId = payVendorId;
     }
 
+    public Integer getPayMchId() {
+        return payMchId;
+    }
+
+    public void setPayMchId(Integer payMchId) {
+        this.payMchId = payMchId;
+    }
+
     public Long getAmount() {
         return amount;
     }
@@ -72,8 +72,8 @@ public class PayInOrder implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", payInOrderId=").append(payInOrderId);
-        sb.append(", payMchId=").append(payMchId);
         sb.append(", payVendorId=").append(payVendorId);
+        sb.append(", payMchId=").append(payMchId);
         sb.append(", amount=").append(amount);
         sb.append(", status=").append(status);
         sb.append(", ctime=").append(ctime);
@@ -94,8 +94,8 @@ public class PayInOrder implements Serializable {
         }
         PayInOrder other = (PayInOrder) that;
         return (this.getPayInOrderId() == null ? other.getPayInOrderId() == null : this.getPayInOrderId().equals(other.getPayInOrderId()))
-            && (this.getPayMchId() == null ? other.getPayMchId() == null : this.getPayMchId().equals(other.getPayMchId()))
             && (this.getPayVendorId() == null ? other.getPayVendorId() == null : this.getPayVendorId().equals(other.getPayVendorId()))
+            && (this.getPayMchId() == null ? other.getPayMchId() == null : this.getPayMchId().equals(other.getPayMchId()))
             && (this.getAmount() == null ? other.getAmount() == null : this.getAmount().equals(other.getAmount()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()));
@@ -106,8 +106,8 @@ public class PayInOrder implements Serializable {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getPayInOrderId() == null) ? 0 : getPayInOrderId().hashCode());
-        result = prime * result + ((getPayMchId() == null) ? 0 : getPayMchId().hashCode());
         result = prime * result + ((getPayVendorId() == null) ? 0 : getPayVendorId().hashCode());
+        result = prime * result + ((getPayMchId() == null) ? 0 : getPayMchId().hashCode());
         result = prime * result + ((getAmount() == null) ? 0 : getAmount().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());

zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/model/PayInOrderExample.java

@@ -187,123 +187,123 @@ public class PayInOrderExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdIsNull() {
-            addCriterion("pay_mch_id is null");
+        public Criteria andPayVendorIdIsNull() {
+            addCriterion("pay_vendor_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdIsNotNull() {
-            addCriterion("pay_mch_id is not null");
+        public Criteria andPayVendorIdIsNotNull() {
+            addCriterion("pay_vendor_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdEqualTo(Integer value) {
-            addCriterion("pay_mch_id =", value, "payMchId");
+        public Criteria andPayVendorIdEqualTo(Integer value) {
+            addCriterion("pay_vendor_id =", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdNotEqualTo(Integer value) {
-            addCriterion("pay_mch_id <>", value, "payMchId");
+        public Criteria andPayVendorIdNotEqualTo(Integer value) {
+            addCriterion("pay_vendor_id <>", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdGreaterThan(Integer value) {
-            addCriterion("pay_mch_id >", value, "payMchId");
+        public Criteria andPayVendorIdGreaterThan(Integer value) {
+            addCriterion("pay_vendor_id >", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pay_mch_id >=", value, "payMchId");
+        public Criteria andPayVendorIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pay_vendor_id >=", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdLessThan(Integer value) {
-            addCriterion("pay_mch_id <", value, "payMchId");
+        public Criteria andPayVendorIdLessThan(Integer value) {
+            addCriterion("pay_vendor_id <", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdLessThanOrEqualTo(Integer value) {
-            addCriterion("pay_mch_id <=", value, "payMchId");
+        public Criteria andPayVendorIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pay_vendor_id <=", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdIn(List<Integer> values) {
-            addCriterion("pay_mch_id in", values, "payMchId");
+        public Criteria andPayVendorIdIn(List<Integer> values) {
+            addCriterion("pay_vendor_id in", values, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdNotIn(List<Integer> values) {
-            addCriterion("pay_mch_id not in", values, "payMchId");
+        public Criteria andPayVendorIdNotIn(List<Integer> values) {
+            addCriterion("pay_vendor_id not in", values, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdBetween(Integer value1, Integer value2) {
-            addCriterion("pay_mch_id between", value1, value2, "payMchId");
+        public Criteria andPayVendorIdBetween(Integer value1, Integer value2) {
+            addCriterion("pay_vendor_id between", value1, value2, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("pay_mch_id not between", value1, value2, "payMchId");
+        public Criteria andPayVendorIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pay_vendor_id not between", value1, value2, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdIsNull() {
-            addCriterion("pay_vendor_id is null");
+        public Criteria andPayMchIdIsNull() {
+            addCriterion("pay_mch_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdIsNotNull() {
-            addCriterion("pay_vendor_id is not null");
+        public Criteria andPayMchIdIsNotNull() {
+            addCriterion("pay_mch_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdEqualTo(Integer value) {
-            addCriterion("pay_vendor_id =", value, "payVendorId");
+        public Criteria andPayMchIdEqualTo(Integer value) {
+            addCriterion("pay_mch_id =", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdNotEqualTo(Integer value) {
-            addCriterion("pay_vendor_id <>", value, "payVendorId");
+        public Criteria andPayMchIdNotEqualTo(Integer value) {
+            addCriterion("pay_mch_id <>", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdGreaterThan(Integer value) {
-            addCriterion("pay_vendor_id >", value, "payVendorId");
+        public Criteria andPayMchIdGreaterThan(Integer value) {
+            addCriterion("pay_mch_id >", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pay_vendor_id >=", value, "payVendorId");
+        public Criteria andPayMchIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pay_mch_id >=", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdLessThan(Integer value) {
-            addCriterion("pay_vendor_id <", value, "payVendorId");
+        public Criteria andPayMchIdLessThan(Integer value) {
+            addCriterion("pay_mch_id <", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdLessThanOrEqualTo(Integer value) {
-            addCriterion("pay_vendor_id <=", value, "payVendorId");
+        public Criteria andPayMchIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pay_mch_id <=", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdIn(List<Integer> values) {
-            addCriterion("pay_vendor_id in", values, "payVendorId");
+        public Criteria andPayMchIdIn(List<Integer> values) {
+            addCriterion("pay_mch_id in", values, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdNotIn(List<Integer> values) {
-            addCriterion("pay_vendor_id not in", values, "payVendorId");
+        public Criteria andPayMchIdNotIn(List<Integer> values) {
+            addCriterion("pay_mch_id not in", values, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdBetween(Integer value1, Integer value2) {
-            addCriterion("pay_vendor_id between", value1, value2, "payVendorId");
+        public Criteria andPayMchIdBetween(Integer value1, Integer value2) {
+            addCriterion("pay_mch_id between", value1, value2, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("pay_vendor_id not between", value1, value2, "payVendorId");
+        public Criteria andPayMchIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pay_mch_id not between", value1, value2, "payMchId");
             return (Criteria) this;
         }
 

zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/model/PayType.java

@@ -5,10 +5,10 @@ import java.io.Serializable;
 public class PayType implements Serializable {
     private Integer payTypeId;
 
-    private Integer payMchId;
-
     private Integer payVendorId;
 
+    private Integer payMchId;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getPayTypeId() {
@@ -19,14 +19,6 @@ public class PayType implements Serializable {
         this.payTypeId = payTypeId;
     }
 
-    public Integer getPayMchId() {
-        return payMchId;
-    }
-
-    public void setPayMchId(Integer payMchId) {
-        this.payMchId = payMchId;
-    }
-
     public Integer getPayVendorId() {
         return payVendorId;
     }
@@ -35,6 +27,14 @@ public class PayType implements Serializable {
         this.payVendorId = payVendorId;
     }
 
+    public Integer getPayMchId() {
+        return payMchId;
+    }
+
+    public void setPayMchId(Integer payMchId) {
+        this.payMchId = payMchId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -42,8 +42,8 @@ public class PayType implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", payTypeId=").append(payTypeId);
-        sb.append(", payMchId=").append(payMchId);
         sb.append(", payVendorId=").append(payVendorId);
+        sb.append(", payMchId=").append(payMchId);
         sb.append("]");
         return sb.toString();
     }
@@ -61,8 +61,8 @@ public class PayType implements Serializable {
         }
         PayType other = (PayType) that;
         return (this.getPayTypeId() == null ? other.getPayTypeId() == null : this.getPayTypeId().equals(other.getPayTypeId()))
-            && (this.getPayMchId() == null ? other.getPayMchId() == null : this.getPayMchId().equals(other.getPayMchId()))
-            && (this.getPayVendorId() == null ? other.getPayVendorId() == null : this.getPayVendorId().equals(other.getPayVendorId()));
+            && (this.getPayVendorId() == null ? other.getPayVendorId() == null : this.getPayVendorId().equals(other.getPayVendorId()))
+            && (this.getPayMchId() == null ? other.getPayMchId() == null : this.getPayMchId().equals(other.getPayMchId()));
     }
 
     @Override
@@ -70,8 +70,8 @@ public class PayType implements Serializable {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getPayTypeId() == null) ? 0 : getPayTypeId().hashCode());
-        result = prime * result + ((getPayMchId() == null) ? 0 : getPayMchId().hashCode());
         result = prime * result + ((getPayVendorId() == null) ? 0 : getPayVendorId().hashCode());
+        result = prime * result + ((getPayMchId() == null) ? 0 : getPayMchId().hashCode());
         return result;
     }
 }

zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/model/PayTypeExample.java

@@ -187,123 +187,123 @@ public class PayTypeExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdIsNull() {
-            addCriterion("pay_mch_id is null");
+        public Criteria andPayVendorIdIsNull() {
+            addCriterion("pay_vendor_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdIsNotNull() {
-            addCriterion("pay_mch_id is not null");
+        public Criteria andPayVendorIdIsNotNull() {
+            addCriterion("pay_vendor_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdEqualTo(Integer value) {
-            addCriterion("pay_mch_id =", value, "payMchId");
+        public Criteria andPayVendorIdEqualTo(Integer value) {
+            addCriterion("pay_vendor_id =", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdNotEqualTo(Integer value) {
-            addCriterion("pay_mch_id <>", value, "payMchId");
+        public Criteria andPayVendorIdNotEqualTo(Integer value) {
+            addCriterion("pay_vendor_id <>", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdGreaterThan(Integer value) {
-            addCriterion("pay_mch_id >", value, "payMchId");
+        public Criteria andPayVendorIdGreaterThan(Integer value) {
+            addCriterion("pay_vendor_id >", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pay_mch_id >=", value, "payMchId");
+        public Criteria andPayVendorIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pay_vendor_id >=", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdLessThan(Integer value) {
-            addCriterion("pay_mch_id <", value, "payMchId");
+        public Criteria andPayVendorIdLessThan(Integer value) {
+            addCriterion("pay_vendor_id <", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdLessThanOrEqualTo(Integer value) {
-            addCriterion("pay_mch_id <=", value, "payMchId");
+        public Criteria andPayVendorIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pay_vendor_id <=", value, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdIn(List<Integer> values) {
-            addCriterion("pay_mch_id in", values, "payMchId");
+        public Criteria andPayVendorIdIn(List<Integer> values) {
+            addCriterion("pay_vendor_id in", values, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdNotIn(List<Integer> values) {
-            addCriterion("pay_mch_id not in", values, "payMchId");
+        public Criteria andPayVendorIdNotIn(List<Integer> values) {
+            addCriterion("pay_vendor_id not in", values, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdBetween(Integer value1, Integer value2) {
-            addCriterion("pay_mch_id between", value1, value2, "payMchId");
+        public Criteria andPayVendorIdBetween(Integer value1, Integer value2) {
+            addCriterion("pay_vendor_id between", value1, value2, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayMchIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("pay_mch_id not between", value1, value2, "payMchId");
+        public Criteria andPayVendorIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pay_vendor_id not between", value1, value2, "payVendorId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdIsNull() {
-            addCriterion("pay_vendor_id is null");
+        public Criteria andPayMchIdIsNull() {
+            addCriterion("pay_mch_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdIsNotNull() {
-            addCriterion("pay_vendor_id is not null");
+        public Criteria andPayMchIdIsNotNull() {
+            addCriterion("pay_mch_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdEqualTo(Integer value) {
-            addCriterion("pay_vendor_id =", value, "payVendorId");
+        public Criteria andPayMchIdEqualTo(Integer value) {
+            addCriterion("pay_mch_id =", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdNotEqualTo(Integer value) {
-            addCriterion("pay_vendor_id <>", value, "payVendorId");
+        public Criteria andPayMchIdNotEqualTo(Integer value) {
+            addCriterion("pay_mch_id <>", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdGreaterThan(Integer value) {
-            addCriterion("pay_vendor_id >", value, "payVendorId");
+        public Criteria andPayMchIdGreaterThan(Integer value) {
+            addCriterion("pay_mch_id >", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pay_vendor_id >=", value, "payVendorId");
+        public Criteria andPayMchIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pay_mch_id >=", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdLessThan(Integer value) {
-            addCriterion("pay_vendor_id <", value, "payVendorId");
+        public Criteria andPayMchIdLessThan(Integer value) {
+            addCriterion("pay_mch_id <", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdLessThanOrEqualTo(Integer value) {
-            addCriterion("pay_vendor_id <=", value, "payVendorId");
+        public Criteria andPayMchIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pay_mch_id <=", value, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdIn(List<Integer> values) {
-            addCriterion("pay_vendor_id in", values, "payVendorId");
+        public Criteria andPayMchIdIn(List<Integer> values) {
+            addCriterion("pay_mch_id in", values, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdNotIn(List<Integer> values) {
-            addCriterion("pay_vendor_id not in", values, "payVendorId");
+        public Criteria andPayMchIdNotIn(List<Integer> values) {
+            addCriterion("pay_mch_id not in", values, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdBetween(Integer value1, Integer value2) {
-            addCriterion("pay_vendor_id between", value1, value2, "payVendorId");
+        public Criteria andPayMchIdBetween(Integer value1, Integer value2) {
+            addCriterion("pay_mch_id between", value1, value2, "payMchId");
             return (Criteria) this;
         }
 
-        public Criteria andPayVendorIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("pay_vendor_id not between", value1, value2, "payVendorId");
+        public Criteria andPayMchIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pay_mch_id not between", value1, value2, "payMchId");
             return (Criteria) this;
         }
     }

zheng-pay/zheng-pay-dao/src/main/resources/generatorConfig.xml

@@ -5,9 +5,6 @@
     <!-- 配置文件 -->
     <properties resource="jdbc.properties"></properties>
 
-    <!-- mysql驱动包 -->
-    <classPathEntry location="${classPathEntry}" />
-
     <context id="MysqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>

zheng-pay/zheng-pay-dao/src/main/resources/jdbc.properties

@@ -1,6 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
 jdbc.username=root
-jdbc.password=123456
-
-classPathEntry=D:/mysql-connector-java-5.1.34.jar
+jdbc.password=123456

zheng-ucenter/zheng-ucenter-dao/src/main/resources/generatorConfig.xml

@@ -5,9 +5,6 @@
     <!-- 配置文件 -->
     <properties resource="jdbc.properties"></properties>
 
-    <!-- mysql驱动包 -->
-    <classPathEntry location="${classPathEntry}" />
-
     <context id="MysqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>

zheng-ucenter/zheng-ucenter-dao/src/main/resources/jdbc.properties

@@ -1,6 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
 jdbc.username=root
-jdbc.password=123456
-
-classPathEntry=D:/mysql-connector-java-5.1.34.jar
+jdbc.password=123456

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml

@@ -5,7 +5,7 @@
     <id column="system_id" jdbcType="INTEGER" property="systemId" />
     <result column="icon" jdbcType="VARCHAR" property="icon" />
     <result column="basepath" jdbcType="VARCHAR" property="basepath" />
-    <result column="status" jdbcType="SMALLINT" property="status" />
+    <result column="status" jdbcType="TINYINT" property="status" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
     <result column="orders" jdbcType="BIGINT" property="orders" />
@@ -114,7 +114,7 @@
       status, name, ctime, 
       orders)
     values (#{systemId,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, #{basepath,jdbcType=VARCHAR}, 
-      #{status,jdbcType=SMALLINT}, #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
+      #{status,jdbcType=TINYINT}, #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
       #{orders,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsSystem">
@@ -153,7 +153,7 @@
         #{basepath,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
-        #{status,jdbcType=SMALLINT},
+        #{status,jdbcType=TINYINT},
       </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
@@ -185,7 +185,7 @@
         basepath = #{record.basepath,jdbcType=VARCHAR},
       </if>
       <if test="record.status != null">
-        status = #{record.status,jdbcType=SMALLINT},
+        status = #{record.status,jdbcType=TINYINT},
       </if>
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
@@ -206,7 +206,7 @@
     set system_id = #{record.systemId,jdbcType=INTEGER},
       icon = #{record.icon,jdbcType=VARCHAR},
       basepath = #{record.basepath,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=SMALLINT},
+      status = #{record.status,jdbcType=TINYINT},
       name = #{record.name,jdbcType=VARCHAR},
       ctime = #{record.ctime,jdbcType=BIGINT},
       orders = #{record.orders,jdbcType=BIGINT}
@@ -224,7 +224,7 @@
         basepath = #{basepath,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
-        status = #{status,jdbcType=SMALLINT},
+        status = #{status,jdbcType=TINYINT},
       </if>
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
@@ -242,7 +242,7 @@
     update upms_system
     set icon = #{icon,jdbcType=VARCHAR},
       basepath = #{basepath,jdbcType=VARCHAR},
-      status = #{status,jdbcType=SMALLINT},
+      status = #{status,jdbcType=TINYINT},
       name = #{name,jdbcType=VARCHAR},
       ctime = #{ctime,jdbcType=BIGINT},
       orders = #{orders,jdbcType=BIGINT}

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsSystem.java

@@ -9,7 +9,7 @@ public class UpmsSystem implements Serializable {
 
     private String basepath;
 
-    private Short status;
+    private Byte status;
 
     private String name;
 
@@ -43,11 +43,11 @@ public class UpmsSystem implements Serializable {
         this.basepath = basepath;
     }
 
-    public Short getStatus() {
+    public Byte getStatus() {
         return status;
     }
 
-    public void setStatus(Short status) {
+    public void setStatus(Byte status) {
         this.status = status;
     }
 

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsSystemExample.java

@@ -337,52 +337,52 @@ public class UpmsSystemExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(Short value) {
+        public Criteria andStatusEqualTo(Byte value) {
             addCriterion("status =", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(Short value) {
+        public Criteria andStatusNotEqualTo(Byte value) {
             addCriterion("status <>", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(Short value) {
+        public Criteria andStatusGreaterThan(Byte value) {
             addCriterion("status >", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(Short value) {
+        public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
             addCriterion("status >=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(Short value) {
+        public Criteria andStatusLessThan(Byte value) {
             addCriterion("status <", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(Short value) {
+        public Criteria andStatusLessThanOrEqualTo(Byte value) {
             addCriterion("status <=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<Short> values) {
+        public Criteria andStatusIn(List<Byte> values) {
             addCriterion("status in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<Short> values) {
+        public Criteria andStatusNotIn(List<Byte> values) {
             addCriterion("status not in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(Short value1, Short value2) {
+        public Criteria andStatusBetween(Byte value1, Byte value2) {
             addCriterion("status between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(Short value1, Short value2) {
+        public Criteria andStatusNotBetween(Byte value1, Byte value2) {
             addCriterion("status not between", value1, value2, "status");
             return (Criteria) this;
         }

zheng-upms/zheng-upms-dao/src/main/resources/generatorConfig.xml

@@ -5,9 +5,6 @@
     <!-- 配置文件 -->
     <properties resource="jdbc.properties"></properties>
 
-    <!-- mysql驱动包 -->
-    <classPathEntry location="${classPathEntry}" />
-
     <context id="MysqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>

zheng-upms/zheng-upms-dao/src/main/resources/jdbc.properties

@@ -1,6 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
 jdbc.username=root
-jdbc.password=123456
-
-classPathEntry=D:/mysql-connector-java-5.1.34.jar
+jdbc.password=123456

zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/generatorConfig.xml

@@ -5,9 +5,6 @@
     <!-- 配置文件 -->
     <properties resource="jdbc.properties"></properties>
 
-    <!-- mysql驱动包 -->
-    <classPathEntry location="${classPathEntry}" />
-
     <context id="MysqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>

zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/jdbc.properties

@@ -1,6 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
 jdbc.username=root
-jdbc.password=123456
-
-classPathEntry=D:/mysql-connector-java-5.1.34.jar
+jdbc.password=123456