From fb63166ec9adac85b409f4b81b0596329a65ae1c Mon Sep 17 00:00:00 2001 From: yang_shj Date: Wed, 23 Feb 2022 14:50:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:0=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 2 +- .idea/misc.xml | 5 + .idea/vcs.xml | 6 + .../PaymentBaseApplication.java | 2 +- .../base/springcloud}/base/CommonResult.java | 2 +- .../springcloud}/constant/ErrorConstant.java | 2 +- .../controller/MerchantController.java | 4 +- .../base/springcloud/dao/MerchantMapper.java | 17 + .../com/base/springcloud/entity/Merchant.java | 28 ++ .../service/MerchantService.java | 2 +- .../service/imp/MerchantServiceImp.java | 4 +- .../base/springclould/dao/MerchantDao.java | 13 - .../base/payment/mapper/MerchantMapper.xml | 312 ++++++++++++++++++ .../src/main/resources/generatorConfig.xml | 76 +++++ .../src/main/resources/jdbc.properties | 4 + .../main/resources/mapper/MerchantMapper.xml | 52 --- payment-common-app/payment-common-app.iml | 2 - payment-common-app/pom.xml | 35 -- .../springcloud/pojo/merchant/Merchant.java | 23 -- .../springcloud/pojo/base/CommonResult.class | Bin 3430 -> 0 bytes .../pojo/constant/ErrorConstant.class | Bin 1998 -> 0 bytes .../springcloud/pojo/merchant/Merchant.class | Bin 3335 -> 0 bytes .../target/maven-archiver/pom.properties | 5 - .../compile/default-compile/createdFiles.lst | 2 - .../compile/default-compile/inputFiles.lst | 2 - .../default-testCompile/inputFiles.lst | 0 .../payment-common-app-1.0-SNAPSHOT.jar | Bin 5488 -> 0 bytes payment-eureka-app/pom.xml | 1 - pom.xml | 43 ++- 29 files changed, 498 insertions(+), 146 deletions(-) create mode 100644 .idea/vcs.xml rename payment-base-app/src/main/java/com/base/{springclould => springcloud}/PaymentBaseApplication.java (92%) rename {payment-common-app/src/main/java/com/rbs/springcloud/pojo => payment-base-app/src/main/java/com/base/springcloud}/base/CommonResult.java (91%) rename {payment-common-app/src/main/java/com/rbs/springcloud/pojo => payment-base-app/src/main/java/com/base/springcloud}/constant/ErrorConstant.java (93%) rename payment-base-app/src/main/java/com/base/{springclould => springcloud}/controller/MerchantController.java (88%) create mode 100644 payment-base-app/src/main/java/com/base/springcloud/dao/MerchantMapper.java create mode 100644 payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java rename payment-base-app/src/main/java/com/base/{springclould => springcloud}/service/MerchantService.java (76%) rename payment-base-app/src/main/java/com/base/{springclould => springcloud}/service/imp/MerchantServiceImp.java (73%) delete mode 100644 payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java create mode 100644 payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml create mode 100644 payment-base-app/src/main/resources/generatorConfig.xml create mode 100644 payment-base-app/src/main/resources/jdbc.properties delete mode 100644 payment-base-app/src/main/resources/mapper/MerchantMapper.xml delete mode 100644 payment-common-app/payment-common-app.iml delete mode 100644 payment-common-app/pom.xml delete mode 100644 payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java delete mode 100644 payment-common-app/target/classes/com/rbs/springcloud/pojo/base/CommonResult.class delete mode 100644 payment-common-app/target/classes/com/rbs/springcloud/pojo/constant/ErrorConstant.class delete mode 100644 payment-common-app/target/classes/com/rbs/springcloud/pojo/merchant/Merchant.class delete mode 100644 payment-common-app/target/maven-archiver/pom.properties delete mode 100644 payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 payment-common-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst delete mode 100644 payment-common-app/target/payment-common-app-1.0-SNAPSHOT.jar diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 72985eb..caca779 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,11 +7,11 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b661a5..fa18721 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,11 @@ + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java b/payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java similarity index 92% rename from payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java rename to payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java index 2ab436a..2ebd8b0 100644 --- a/payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java +++ b/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; diff --git a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java b/payment-base-app/src/main/java/com/base/springcloud/base/CommonResult.java similarity index 91% rename from payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java rename to payment-base-app/src/main/java/com/base/springcloud/base/CommonResult.java index c8ad5f7..e74764d 100644 --- a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java +++ b/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; diff --git a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java b/payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java similarity index 93% rename from payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java rename to payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java index f7767db..cf68c70 100644 --- a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java +++ b/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 { diff --git a/payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java similarity index 88% rename from payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java rename to payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java index da03b7b..662a1de 100644 --- a/payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java +++ b/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.*; diff --git a/payment-base-app/src/main/java/com/base/springcloud/dao/MerchantMapper.java b/payment-base-app/src/main/java/com/base/springcloud/dao/MerchantMapper.java new file mode 100644 index 0000000..79c8390 --- /dev/null +++ b/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); +} \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java b/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java new file mode 100644 index 0000000..215acce --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java b/payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java similarity index 76% rename from payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java rename to payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java index 25a190e..e000bdb 100644 --- a/payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java +++ b/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; diff --git a/payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java similarity index 73% rename from payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java rename to payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java index 95dc008..1e588b9 100644 --- a/payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java +++ b/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; diff --git a/payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java b/payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java deleted file mode 100644 index 4596ea1..0000000 --- a/payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java +++ /dev/null @@ -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); -} diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml new file mode 100644 index 0000000..26366d4 --- /dev/null +++ b/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp + + + + delete from pay_merchant + where id = #{id,jdbcType=VARCHAR} + + + 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 into pay_merchant + + + id, + + + merchant_id, + + + merchant_name, + + + city_store_name, + + + store_brand_name, + + + time_stamp, + + + + + #{id,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{merchantName,jdbcType=VARCHAR}, + + + #{cityStoreName,jdbcType=VARCHAR}, + + + #{storeBrandName,jdbcType=VARCHAR}, + + + #{timeStamp,jdbcType=TIMESTAMP}, + + + + + update pay_merchant + + + 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 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} + + + + + + + + + + + id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp + + + + delete from pay_merchant + where id = #{id,jdbcType=VARCHAR} + + + 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 into pay_merchant + + + id, + + + merchant_id, + + + merchant_name, + + + city_store_name, + + + store_brand_name, + + + time_stamp, + + + + + #{id,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{merchantName,jdbcType=VARCHAR}, + + + #{cityStoreName,jdbcType=VARCHAR}, + + + #{storeBrandName,jdbcType=VARCHAR}, + + + #{timeStamp,jdbcType=TIMESTAMP}, + + + + + update pay_merchant + + + 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 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} + + + + + + + + + + + id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp + + + + delete from pay_merchant + where id = #{id,jdbcType=VARCHAR} + + + 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 into pay_merchant + + + id, + + + merchant_id, + + + merchant_name, + + + city_store_name, + + + store_brand_name, + + + time_stamp, + + + + + #{id,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{merchantName,jdbcType=VARCHAR}, + + + #{cityStoreName,jdbcType=VARCHAR}, + + + #{storeBrandName,jdbcType=VARCHAR}, + + + #{timeStamp,jdbcType=TIMESTAMP}, + + + + + update pay_merchant + + + 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 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} + + \ No newline at end of file diff --git a/payment-base-app/src/main/resources/generatorConfig.xml b/payment-base-app/src/main/resources/generatorConfig.xml new file mode 100644 index 0000000..8ee957c --- /dev/null +++ b/payment-base-app/src/main/resources/generatorConfig.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/payment-base-app/src/main/resources/jdbc.properties b/payment-base-app/src/main/resources/jdbc.properties new file mode 100644 index 0000000..4b533e6 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/payment-base-app/src/main/resources/mapper/MerchantMapper.xml b/payment-base-app/src/main/resources/mapper/MerchantMapper.xml deleted file mode 100644 index 551c67b..0000000 --- a/payment-base-app/src/main/resources/mapper/MerchantMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - insert into merchant - - - merchant_id, - - - merchant_name, - - - city_store_name, - - - store_brand_name, - - - time_stamp, - - - - - #{merchantId,jdbcType=varchar}, - - - #{merchantName,jdbcType=varchar}, - - - #{cityStoreName,jdbcType=varchar}, - - - #{storeBrandName,jdbcType=varchar}, - - - #{timeStamp,jdbcType=varchar}, - - - - \ No newline at end of file diff --git a/payment-common-app/payment-common-app.iml b/payment-common-app/payment-common-app.iml deleted file mode 100644 index 78b2cc5..0000000 --- a/payment-common-app/payment-common-app.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/payment-common-app/pom.xml b/payment-common-app/pom.xml deleted file mode 100644 index fbedc80..0000000 --- a/payment-common-app/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - rbsservice - com.rbs.springcloud - 1.0-SNAPSHOT - - 4.0.0 - - payment-common-app - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - cn.hutool - hutool-all - 5.1.0 - - - - - diff --git a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java b/payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java deleted file mode 100644 index 90e89a6..0000000 --- a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java +++ /dev/null @@ -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; -} diff --git a/payment-common-app/target/classes/com/rbs/springcloud/pojo/base/CommonResult.class b/payment-common-app/target/classes/com/rbs/springcloud/pojo/base/CommonResult.class deleted file mode 100644 index 2e471f488c46337d07ef2b4b528d113d7265895e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3430 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 diff --git a/payment-common-app/target/maven-archiver/pom.properties b/payment-common-app/target/maven-archiver/pom.properties deleted file mode 100644 index e107b80..0000000 --- a/payment-common-app/target/maven-archiver/pom.properties +++ /dev/null @@ -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 diff --git a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 2086f9f..0000000 --- a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -com\rbs\springcloud\pojo\merchant\Merchant.class -com\rbs\springcloud\pojo\base\CommonResult.class diff --git a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 525989f..0000000 --- a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -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 diff --git a/payment-common-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/payment-common-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/payment-common-app/target/payment-common-app-1.0-SNAPSHOT.jar b/payment-common-app/target/payment-common-app-1.0-SNAPSHOT.jar deleted file mode 100644 index 7b9e23639224d6f08d3ff03f94619dd8b1c4b7f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5488 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 P9pRTq2n3z<#DD(+=vR0W diff --git a/payment-eureka-app/pom.xml b/payment-eureka-app/pom.xml index cd4b09d..53cb921 100644 --- a/payment-eureka-app/pom.xml +++ b/payment-eureka-app/pom.xml @@ -37,5 +37,4 @@ test - \ No newline at end of file diff --git a/pom.xml b/pom.xml index c2e8062..a8278ae 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,7 @@ pom 1.0-SNAPSHOT - payment-common-app payment-base-app - rbs-eureka-server-app payment-eureka-app @@ -88,6 +86,47 @@ logback-core 1.2.3 + + + mysql + mysql-connector-java + 5.1.38 + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.4 + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.4 + + + mysql + mysql-connector-java + 5.1.38 + + + + true + + + + + + src/main/resources + + lib/*.jar + + + + \ No newline at end of file