diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml index f90009e..eb279c9 100644 --- a/payment-base-app/pom.xml +++ b/payment-base-app/pom.xml @@ -12,13 +12,6 @@ payment-base-app - - - com.rbs.springcloud - payment-common-app - ${project.version} - - org.springframework.cloud diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java index 662a1de..82bc4e0 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java +++ b/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; diff --git a/payment-base-app/target/classes/application.yml b/payment-base-app/target/classes/application.yml index d2f407a..3f24cf3 100644 --- a/payment-base-app/target/classes/application.yml +++ b/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 diff --git a/payment-base-app/target/classes/com/base/springclould/PaymentBaseApplication.class b/payment-base-app/target/classes/com/base/springclould/PaymentBaseApplication.class deleted file mode 100644 index 4440c91..0000000 Binary files a/payment-base-app/target/classes/com/base/springclould/PaymentBaseApplication.class and /dev/null differ diff --git a/payment-base-app/target/classes/com/base/springclould/controller/MerchantController.class b/payment-base-app/target/classes/com/base/springclould/controller/MerchantController.class deleted file mode 100644 index 45b0326..0000000 Binary files a/payment-base-app/target/classes/com/base/springclould/controller/MerchantController.class and /dev/null differ diff --git a/payment-base-app/target/classes/com/base/springclould/dao/MerchantDao.class b/payment-base-app/target/classes/com/base/springclould/dao/MerchantDao.class deleted file mode 100644 index 4f03e1a..0000000 Binary files a/payment-base-app/target/classes/com/base/springclould/dao/MerchantDao.class and /dev/null differ diff --git a/payment-base-app/target/classes/com/base/springclould/service/MerchantService.class b/payment-base-app/target/classes/com/base/springclould/service/MerchantService.class deleted file mode 100644 index 6c482c6..0000000 Binary files a/payment-base-app/target/classes/com/base/springclould/service/MerchantService.class and /dev/null differ diff --git a/payment-base-app/target/classes/com/base/springclould/service/imp/MerchantServiceImp.class b/payment-base-app/target/classes/com/base/springclould/service/imp/MerchantServiceImp.class deleted file mode 100644 index fc2ca91..0000000 Binary files a/payment-base-app/target/classes/com/base/springclould/service/imp/MerchantServiceImp.class and /dev/null differ diff --git a/payment-base-app/target/classes/mapper/MerchantMapper.xml b/payment-base-app/target/classes/mapper/MerchantMapper.xml deleted file mode 100644 index 551c67b..0000000 --- a/payment-base-app/target/classes/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