feat:0 支付工程

payment-base-app/pom.xml

@@ -12,13 +12,6 @@
     <artifactId>payment-base-app</artifactId>
 
     <dependencies>
-        <!-- 引入实体的包-->
-        <dependency>
-            <groupId>com.rbs.springcloud</groupId>
-            <artifactId>payment-common-app</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- eureka client -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

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

@@ -1,9 +1,9 @@
 package com.base.springcloud.controller;
 
+import com.base.springcloud.base.CommonResult;
+import com.base.springcloud.constant.ErrorConstant;
+import com.base.springcloud.entity.Merchant;
 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.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

payment-base-app/target/classes/application.yml

@@ -10,7 +10,7 @@ eureka:
     fetch-registry: true
     service-url:
       #集群配置
-      defaultZone: http://eureka7001.com:7001/eureka,http://eureka7002.com:7002/eureka
+      defaultZone: http://eureka7002.com:7002/eureka
   instance:
     #服务名称修改
     instance-id: PAYMENT-BASE

payment-base-app/target/classes/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>