feat:0 支付工程

.idea/compiler.xml

@@ -7,11 +7,11 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="payment-eureka-app" />
-        <module name="payment-common-app" />
         <module name="payment-base-app" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="payment-common-app" target="1.8" />
       <module name="rbseurekaserverapp" target="1.8" />
     </bytecodeTargetLevel>
   </component>

.idea/misc.xml

@@ -7,6 +7,11 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/payment-common-app/pom.xml" />
+      </set>
+    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java → payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java

@@ -1,4 +1,4 @@
-package com.base.springclould;
+package com.base.springcloud;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java → payment-base-app/src/main/java/com/base/springcloud/base/CommonResult.java

@@ -1,4 +1,4 @@
-package com.rbs.springcloud.pojo.base;
+package com.base.springcloud.base;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java → payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java

@@ -1,4 +1,4 @@
-package com.rbs.springcloud.pojo.constant;
+package com.base.springcloud.constant;
 
 public enum ErrorConstant {
 

payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java → payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java

@@ -1,6 +1,6 @@
-package com.base.springclould.controller;
+package com.base.springcloud.controller;
 
-import com.base.springclould.service.MerchantService;
+import com.base.springcloud.service.MerchantService;
 import com.rbs.springcloud.pojo.base.CommonResult;
 import com.rbs.springcloud.pojo.constant.ErrorConstant;
 import com.rbs.springcloud.pojo.merchant.*;

payment-base-app/src/main/java/com/base/springcloud/dao/MerchantMapper.java

@@ -0,0 +1,17 @@
+package com.base.springcloud.dao;
+
+import com.base.springcloud.entity.Merchant;
+
+public interface MerchantMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(Merchant record);
+
+    int insertSelective(Merchant record);
+
+    Merchant selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(Merchant record);
+
+    int updateByPrimaryKey(Merchant record);
+}

payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java

@@ -0,0 +1,28 @@
+package com.base.springcloud.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class Merchant {
+    private String id;
+
+    private String merchantId;
+
+    private String merchantName;
+
+    private String cityStoreName;
+
+    private String storeBrandName;
+
+    private Date timeStamp;
+
+    public Merchant(String id, String merchantId, String merchantName, String cityStoreName, String storeBrandName, Date timeStamp) {
+        this.id = id;
+        this.merchantId = merchantId;
+        this.merchantName = merchantName;
+        this.cityStoreName = cityStoreName;
+        this.storeBrandName = storeBrandName;
+        this.timeStamp = timeStamp;
+    }
+}

payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java → payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java

@@ -1,4 +1,4 @@
-package com.base.springclould.service;
+package com.base.springcloud.service;
 
 import com.rbs.springcloud.pojo.merchant.Merchant;
 

payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java → payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java

@@ -1,6 +1,6 @@
-package com.base.springclould.service.imp;
+package com.base.springcloud.service.imp;
 
-import com.base.springclould.service.MerchantService;
+import com.base.springcloud.service.MerchantService;
 import com.rbs.springcloud.pojo.merchant.Merchant;
 import org.springframework.stereotype.Service;
 

payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java

@@ -1,13 +0,0 @@
-package com.base.springclould.dao;
-
-import com.rbs.springcloud.pojo.merchant.Merchant;
-import org.apache.ibatis.annotations.Mapper;
-
-import javax.annotation.Resource;
-
-@Mapper
-@Resource
-public interface MerchantDao {
-
-	int insert(Merchant merchant);
-}

payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml

@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.base.springcloud.dao.MerchantMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Merchant">
+    <constructor>
+      <idArg column="id" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="merchant_id" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="merchant_name" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="city_store_name" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="store_brand_name" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="time_stamp" javaType="java.util.Date" jdbcType="TIMESTAMP" />
+    </constructor>
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant (id, merchant_id, merchant_name, 
+      city_store_name, store_brand_name, time_stamp
+      )
+    values (#{id,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, 
+      #{cityStoreName,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, #{timeStamp,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="merchantId != null">
+        merchant_id,
+      </if>
+      <if test="merchantName != null">
+        merchant_name,
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name,
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name,
+      </if>
+      <if test="timeStamp != null">
+        time_stamp,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    <set>
+      <if test="merchantId != null">
+        merchant_id = #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        merchant_name = #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    set merchant_id = #{merchantId,jdbcType=VARCHAR},
+      merchant_name = #{merchantName,jdbcType=VARCHAR},
+      city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      time_stamp = #{timeStamp,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Merchant">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
+    <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
+    <result column="city_store_name" jdbcType="VARCHAR" property="cityStoreName" />
+    <result column="store_brand_name" jdbcType="VARCHAR" property="storeBrandName" />
+    <result column="time_stamp" jdbcType="TIMESTAMP" property="timeStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant (id, merchant_id, merchant_name, 
+      city_store_name, store_brand_name, time_stamp
+      )
+    values (#{id,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, 
+      #{cityStoreName,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, #{timeStamp,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="merchantId != null">
+        merchant_id,
+      </if>
+      <if test="merchantName != null">
+        merchant_name,
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name,
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name,
+      </if>
+      <if test="timeStamp != null">
+        time_stamp,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    <set>
+      <if test="merchantId != null">
+        merchant_id = #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        merchant_name = #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    set merchant_id = #{merchantId,jdbcType=VARCHAR},
+      merchant_name = #{merchantName,jdbcType=VARCHAR},
+      city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      time_stamp = #{timeStamp,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Merchant">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
+    <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
+    <result column="city_store_name" jdbcType="VARCHAR" property="cityStoreName" />
+    <result column="store_brand_name" jdbcType="VARCHAR" property="storeBrandName" />
+    <result column="time_stamp" jdbcType="TIMESTAMP" property="timeStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_merchant
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant (id, merchant_id, merchant_name, 
+      city_store_name, store_brand_name, time_stamp
+      )
+    values (#{id,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, 
+      #{cityStoreName,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, #{timeStamp,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.Merchant">
+    insert into pay_merchant
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="merchantId != null">
+        merchant_id,
+      </if>
+      <if test="merchantName != null">
+        merchant_name,
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name,
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name,
+      </if>
+      <if test="timeStamp != null">
+        time_stamp,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    <set>
+      <if test="merchantId != null">
+        merchant_id = #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantName != null">
+        merchant_name = #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityStoreName != null">
+        city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      </if>
+      <if test="storeBrandName != null">
+        store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeStamp != null">
+        time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.Merchant">
+    update pay_merchant
+    set merchant_id = #{merchantId,jdbcType=VARCHAR},
+      merchant_name = #{merchantName,jdbcType=VARCHAR},
+      city_store_name = #{cityStoreName,jdbcType=VARCHAR},
+      store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
+      time_stamp = #{timeStamp,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

payment-base-app/src/main/resources/generatorConfig.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd" >
+<generatorConfiguration>
+    <!-- 引入配置文件 -->
+    <properties resource="jdbc.properties"/>
+
+    <!-- 一个数据库一个context -->
+    <context id="infoGuardian">
+        <!-- 注释 -->
+        <commentGenerator>
+            <property name="suppressAllComments" value="true"/><!-- 是否取消注释 -->
+            <property name="suppressDate" value="true"/> <!-- 是否生成注释代时间戳 -->
+        </commentGenerator>
+
+        <!-- jdbc连接 -->
+        <jdbcConnection driverClass="${jdbc.driver}"
+                        connectionURL="${jdbc.url}" userId="${jdbc.username}" password="${jdbc.password}"/>
+
+        <!-- 类型转换 -->
+        <javaTypeResolver>
+            <!-- 是否使用bigDecimal， false可自动转化以下类型（Long, Integer, Short, etc.） -->
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+
+        <!-- 01 指定javaBean生成的位置 -->
+        <!-- targetPackage：指定生成的model生成所在的包名 -->
+        <!-- targetProject：指定在该项目下所在的路径  -->
+        <javaModelGenerator targetPackage="com.base.springcloud.entity"
+                            targetProject="src/main/java">
+            <!-- 是否允许子包，即targetPackage.schemaName.tableName -->
+            <property name="enableSubPackages" value="false"/>
+            <!-- 是否对model添加构造函数 -->
+            <property name="constructorBased" value="false"/>
+            <!-- 是否针对string类型的字段在set的时候进行trim调用 -->
+            <property name="trimStrings" value="false"/>
+            <!-- 建立的Model对象是否 不可改变  即生成的Model对象不会有 setter方法，只有构造方法 -->
+            <property name="immutable" value="false"/>
+        </javaModelGenerator>
+
+        <!-- 02 指定sql映射文件生成的位置 -->
+        <sqlMapGenerator targetPackage="com.base.payment.mapper"
+                         targetProject="src/main/resources">
+            <!-- 是否允许子包，即targetPackage.schemaName.tableName -->
+            <property name="enableSubPackages" value="false"/>
+        </sqlMapGenerator>
+
+        <!-- 03 生成XxxMapper接口 -->
+        <!-- type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象 -->
+        <!-- type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象 -->
+        <!-- type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口 -->
+        <javaClientGenerator targetPackage="com.base.springcloud.dao"
+                             targetProject="src/main/java" type="XMLMAPPER">
+            <!-- 是否在当前路径下新加一层schema,false路径com.oop.eksp.user.model， true:com.oop.eksp.user.model.[schemaName] -->
+            <property name="enableSubPackages" value="false"/>
+        </javaClientGenerator>
+
+        <!-- 配置表信息 -->
+        <!-- schema即为数据库名 -->
+        <!-- tableName为对应的数据库表 -->
+        <!-- domainObjectName是要生成的实体类 -->
+        <!-- enable*ByExample是否生成 example类 -->
+        <table tableName="pay_merchant" domainObjectName="Merchant"
+               enableCountByExample="false" enableDeleteByExample="false"
+               enableSelectByExample="false" enableUpdateByExample="false">
+            <!-- 忽略列，不生成bean 字段 -->
+            <!-- <ignoreColumn column="FRED" /> -->
+            <!-- 指定列的java数据类型 -->
+            <columnOverride column="merchant_id" property="merchantId" jdbcType="VARCHAR" />
+            <columnOverride column="merchant_name" property="merchantName" jdbcType="VARCHAR" />
+            <columnOverride column="city_store_name" property="cityStoreName" jdbcType="VARCHAR" />
+            <columnOverride column="store_brand_name" property="storeBrandName" jdbcType="VARCHAR" />
+            <!--<columnOverride column="time_stamp" property="timeStamp" jdbcType="TIMESTAMP" /> -->
+        </table>
+    </context>
+</generatorConfiguration>

payment-base-app/src/main/resources/jdbc.properties

@@ -0,0 +1,4 @@
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://106.14.81.251:3306/rbs_erp_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false
+jdbc.username=root
+jdbc.password=hnrr%%360

payment-base-app/src/main/resources/mapper/MerchantMapper.xml

@@ -1,52 +0,0 @@
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dqueryByidtd/mybatis-3-mapper.dtd">
-
-
-<mapper namespace="com.rbs.springcloud.pojo.merchant.Merchant">
-    <resultMap id="BaseResultMap" type="com.rbs.springcloud.pojo.merchant.Merchant">
-        <id column="merchantId" property="merchant_id" jdbcType="varchar"/>
-        <id column="merchantName" property="merchant_name" jdbcType="varchar"/>
-        <id column="cityStoreName" property="city_store_name" jdbcType="varchar"/>
-        <id column="storeBrandName" property="store_brand_name" jdbcType="varchar"/>
-        <id column="timeStamp" property="time_stamp" jdbcType="varchar"/>
-    </resultMap>
-
-    <insert id="insert" parameterType="com.rbs.springcloud.pojo.merchant.Merchant" useGeneratedKeys="true"
-            keyProperty="merchantId">
-        insert into merchant
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="merchantId != null">
-                merchant_id,
-            </if>
-            <if test="merchantName != null">
-                merchant_name,
-            </if>
-            <if test="cityStoreName != null">
-                city_store_name,
-            </if>
-            <if test="storeBrandName != null">
-                store_brand_name,
-            </if>
-            <if test="timeStamp != null">
-                time_stamp,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="merchantId != null and merchantId != ''">
-                #{merchantId,jdbcType=varchar},
-            </if>
-            <if test="merchantName != null and merchantName != ''">
-                #{merchantName,jdbcType=varchar},
-            </if>
-            <if test="cityStoreName != null and cityStoreName != ''">
-                #{cityStoreName,jdbcType=varchar},
-            </if>
-            <if test="storeBrandName != null and storeBrandName != ''">
-                #{storeBrandName,jdbcType=varchar},
-            </if>
-            <if test="timeStamp != null and timeStamp != ''">
-                #{timeStamp,jdbcType=varchar},
-            </if>
-        </trim>
-    </insert>
-</mapper>

payment-common-app/payment-common-app.iml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />

payment-common-app/pom.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>rbsservice</artifactId>
-        <groupId>com.rbs.springcloud</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>payment-common-app</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- 工具包-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.1.0</version>
-        </dependency>
-    </dependencies>
-</project>
-
-

payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java

@@ -1,23 +0,0 @@
-package com.rbs.springcloud.pojo.merchant;
-
-import com.rbs.springcloud.pojo.base.CommonResult;
-import lombok.Data;
-
-@Data
-public class Merchant extends CommonResult {
-
-	// 商户编号
-	private String merchantId;
-
-	// 商户名称
-	private String merchantName;
-
-	// 城市分店名
-	private String cityStoreName;
-
-	// 门店品牌名
-	private String storeBrandName;
-
-	// 时间戳
-	private String timeStamp;
-}

payment-common-app/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed Feb 23 09:55:53 CST 2022
-version=1.0-SNAPSHOT
-groupId=com.rbs.springcloud
-artifactId=payment-common-app

payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,2 +0,0 @@
-com\rbs\springcloud\pojo\merchant\Merchant.class
-com\rbs\springcloud\pojo\base\CommonResult.class

payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,2 +0,0 @@
-F:\RongRun\rbsservice\payment-common-app\src\main\java\com\rbs\springcloud\pojo\merchant\Merchant.java
-F:\RongRun\rbsservice\payment-common-app\src\main\java\com\rbs\springcloud\pojo\base\CommonResult.java

payment-eureka-app/pom.xml

@@ -37,5 +37,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
 </project>

pom.xml

@@ -11,9 +11,7 @@
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <modules>
-        <module>payment-common-app</module>
         <module>payment-base-app</module>
-        <module>rbs-eureka-server-app</module>
         <module>payment-eureka-app</module>
     </modules>
 
@@ -88,6 +86,47 @@
                 <artifactId>logback-core</artifactId>
                 <version>1.2.3</version>
             </dependency>
+
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.38</version>
+            </dependency>
+
+            <!--  mybatis-generator的依赖 自动生成javabean和sql -->
+            <dependency>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+                <version>1.3.4</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+                <version>1.3.4</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>5.1.38</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <overwrite>true</overwrite>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>lib/*.jar</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
 </project>