commit db75f564981a055d2fdd86b70c9a10e2cc9519b6 Author: yang_shj Date: Wed Feb 23 12:37:37 2022 +0800 feat:0 支付工程 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..72985eb --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..56b73e8 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4b661a5 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml new file mode 100644 index 0000000..f90009e --- /dev/null +++ b/payment-base-app/pom.xml @@ -0,0 +1,72 @@ + + + + rbsservice + com.rbs.springcloud + 1.0-SNAPSHOT + + 4.0.0 + + payment-base-app + + + + + com.rbs.springcloud + payment-common-app + ${project.version} + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + \ 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/springclould/PaymentBaseApplication.java new file mode 100644 index 0000000..2ab436a --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java @@ -0,0 +1,14 @@ +package com.base.springclould; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; + +@SpringBootApplication +@EnableEurekaClient +public class PaymentBaseApplication { + + public static void main(String[] args) { + SpringApplication.run(PaymentBaseApplication.class, args); + } +} diff --git a/payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java new file mode 100644 index 0000000..da03b7b --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java @@ -0,0 +1,26 @@ +package com.base.springclould.controller; + +import com.base.springclould.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; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Slf4j +public class MerchantController { + + @Autowired + private MerchantService merchantService; + + @PostMapping("/merchant/add") + public CommonResult create(@RequestBody Merchant merchant) { + // TODO 业务逻辑 + + return new CommonResult(ErrorConstant.NULL_OBJ.getCode(), ErrorConstant.NULL_OBJ.getMessage(), null); + } +} 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 new file mode 100644 index 0000000..4596ea1 --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java @@ -0,0 +1,13 @@ +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/java/com/base/springclould/service/MerchantService.java b/payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java new file mode 100644 index 0000000..25a190e --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java @@ -0,0 +1,8 @@ +package com.base.springclould.service; + +import com.rbs.springcloud.pojo.merchant.Merchant; + +public interface MerchantService { + + void merchantAdd(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/springclould/service/imp/MerchantServiceImp.java new file mode 100644 index 0000000..95dc008 --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java @@ -0,0 +1,14 @@ +package com.base.springclould.service.imp; + +import com.base.springclould.service.MerchantService; +import com.rbs.springcloud.pojo.merchant.Merchant; +import org.springframework.stereotype.Service; + +@Service +public class MerchantServiceImp implements MerchantService { + + @Override + public void merchantAdd(Merchant merchant) { + // TODO 添加商户逻辑 + } +} diff --git a/payment-base-app/src/main/resources/application.yml b/payment-base-app/src/main/resources/application.yml new file mode 100644 index 0000000..3f24cf3 --- /dev/null +++ b/payment-base-app/src/main/resources/application.yml @@ -0,0 +1,32 @@ +server: + port: 8001 #服务端口 +#eureka配置 +#eureka配置 +eureka: + client: + #表示是否将自己注册进eureka 默认为true + register-with-eureka: true + #是否从EurekaServer中抓取已有的注册信息，默认为true，单点无所谓，集群必须设置true才能和ribbon使用负载均衡 + fetch-registry: true + service-url: + #集群配置 + defaultZone: http://eureka7002.com:7002/eureka + instance: + #服务名称修改 + instance-id: PAYMENT-BASE + #访问路径可以显示ip地址 + prefer-ip-address: true +#spring相关配置 +spring: + application: + name: mcroservice-payment #服务名 + datasource: + type: com.alibaba.druid.pool.DruidDataSource #当前数据源操作类型 + driver-class-name: org.gjt.mm.mysql.Driver #数据库驱动包 + url: jdbc:mysql://106.14.81.251:3306/rbs_erp_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false + username: root + password: hnrr%%360 +#mybatis:配置 +mybatis: + mapperLocations: classpath:dao/*.xml + type-aliases-package: com.rbs.springcloud.pojo \ 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 new file mode 100644 index 0000000..551c67b --- /dev/null +++ b/payment-base-app/src/main/resources/mapper/MerchantMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + 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-base-app/target/classes/application.yml b/payment-base-app/target/classes/application.yml new file mode 100644 index 0000000..d2f407a --- /dev/null +++ b/payment-base-app/target/classes/application.yml @@ -0,0 +1,32 @@ +server: + port: 8001 #服务端口 +#eureka配置 +#eureka配置 +eureka: + client: + #表示是否将自己注册进eureka 默认为true + register-with-eureka: true + #是否从EurekaServer中抓取已有的注册信息，默认为true，单点无所谓，集群必须设置true才能和ribbon使用负载均衡 + fetch-registry: true + service-url: + #集群配置 + defaultZone: http://eureka7001.com:7001/eureka,http://eureka7002.com:7002/eureka + instance: + #服务名称修改 + instance-id: PAYMENT-BASE + #访问路径可以显示ip地址 + prefer-ip-address: true +#spring相关配置 +spring: + application: + name: mcroservice-payment #服务名 + datasource: + type: com.alibaba.druid.pool.DruidDataSource #当前数据源操作类型 + driver-class-name: org.gjt.mm.mysql.Driver #数据库驱动包 + url: jdbc:mysql://106.14.81.251:3306/rbs_erp_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false + username: root + password: hnrr%%360 +#mybatis:配置 +mybatis: + mapperLocations: classpath:dao/*.xml + type-aliases-package: com.rbs.springcloud.pojo \ No newline at end of file diff --git a/payment-base-app/target/classes/com/base/springclould/PaymentBaseApplication.class b/payment-base-app/target/classes/com/base/springclould/PaymentBaseApplication.class new file mode 100644 index 0000000..4440c91 Binary files /dev/null and b/payment-base-app/target/classes/com/base/springclould/PaymentBaseApplication.class 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 new file mode 100644 index 0000000..45b0326 Binary files /dev/null and b/payment-base-app/target/classes/com/base/springclould/controller/MerchantController.class 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 new file mode 100644 index 0000000..4f03e1a Binary files /dev/null and b/payment-base-app/target/classes/com/base/springclould/dao/MerchantDao.class 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 new file mode 100644 index 0000000..6c482c6 Binary files /dev/null and b/payment-base-app/target/classes/com/base/springclould/service/MerchantService.class 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 new file mode 100644 index 0000000..fc2ca91 Binary files /dev/null and b/payment-base-app/target/classes/com/base/springclould/service/imp/MerchantServiceImp.class differ diff --git a/payment-base-app/target/classes/mapper/MerchantMapper.xml b/payment-base-app/target/classes/mapper/MerchantMapper.xml new file mode 100644 index 0000000..551c67b --- /dev/null +++ b/payment-base-app/target/classes/mapper/MerchantMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..78b2cc5 --- /dev/null +++ b/payment-common-app/payment-common-app.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/payment-common-app/pom.xml b/payment-common-app/pom.xml new file mode 100644 index 0000000..fbedc80 --- /dev/null +++ b/payment-common-app/pom.xml @@ -0,0 +1,35 @@ + + + + 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/base/CommonResult.java b/payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java new file mode 100644 index 0000000..c8ad5f7 --- /dev/null +++ b/payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java @@ -0,0 +1,26 @@ +package com.rbs.springcloud.pojo.base; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +public class CommonResult { + + //返回状态码 + private String code; + + //返回状态信息 + private String message; + + //返回的数据 + private T data; + + public CommonResult(String code, String message) { + this(code,message,null); + } +} \ No newline at end of file diff --git a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java b/payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java new file mode 100644 index 0000000..f7767db --- /dev/null +++ b/payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java @@ -0,0 +1,38 @@ +package com.rbs.springcloud.pojo.constant; + +public enum ErrorConstant { + + NULL_OBJ("RBS00001","参数异常"); + + private String code; + private String message; + + private ErrorConstant(String code, String message) { + this.setCode(code); + this.setMessage(message); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + @Override + public String toString() { + return "ErrorConstant{" + + "code='" + code + '\'' + + ", message='" + message + '\'' + + '}'; + } +} 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 new file mode 100644 index 0000000..90e89a6 --- /dev/null +++ b/payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000..2e471f4 Binary files /dev/null and b/payment-common-app/target/classes/com/rbs/springcloud/pojo/base/CommonResult.class differ diff --git a/payment-common-app/target/classes/com/rbs/springcloud/pojo/constant/ErrorConstant.class b/payment-common-app/target/classes/com/rbs/springcloud/pojo/constant/ErrorConstant.class new file mode 100644 index 0000000..901fe44 Binary files /dev/null and b/payment-common-app/target/classes/com/rbs/springcloud/pojo/constant/ErrorConstant.class differ diff --git a/payment-common-app/target/classes/com/rbs/springcloud/pojo/merchant/Merchant.class b/payment-common-app/target/classes/com/rbs/springcloud/pojo/merchant/Merchant.class new file mode 100644 index 0000000..fd5a544 Binary files /dev/null and b/payment-common-app/target/classes/com/rbs/springcloud/pojo/merchant/Merchant.class differ diff --git a/payment-common-app/target/maven-archiver/pom.properties b/payment-common-app/target/maven-archiver/pom.properties new file mode 100644 index 0000000..e107b80 --- /dev/null +++ b/payment-common-app/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#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 new file mode 100644 index 0000000..2086f9f --- /dev/null +++ b/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000..525989f --- /dev/null +++ b/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..7b9e236 Binary files /dev/null and b/payment-common-app/target/payment-common-app-1.0-SNAPSHOT.jar differ diff --git a/payment-eureka-app/pom.xml b/payment-eureka-app/pom.xml new file mode 100644 index 0000000..cd4b09d --- /dev/null +++ b/payment-eureka-app/pom.xml @@ -0,0 +1,41 @@ + + + + rbsservice + com.rbs.springcloud + 1.0-SNAPSHOT + + 4.0.0 + + payment-eureka-app + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + \ No newline at end of file diff --git a/payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java b/payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java new file mode 100644 index 0000000..01d2dfd --- /dev/null +++ b/payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java @@ -0,0 +1,14 @@ +package com.eureka.server.springclould; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +@SpringBootApplication +@EnableEurekaServer +public class EurekaServerApplication { + + public static void main(String[] args) { + SpringApplication.run(EurekaServerApplication.class, args); + } +} \ No newline at end of file diff --git a/payment-eureka-app/src/main/resources/application.yml b/payment-eureka-app/src/main/resources/application.yml new file mode 100644 index 0000000..e30b8c3 --- /dev/null +++ b/payment-eureka-app/src/main/resources/application.yml @@ -0,0 +1,11 @@ +server: + port: 7002 +eureka: + instance: + hostname: eureka7002.com #eureka服务端的实例名称 + client: + register-with-eureka: false #false表示不向注册中心注册自己。 + fetch-registry: false #false表示自己端就是注册中心，我的职责就是维护服务实例，并不需要去检索服务 + service-url: + #设置与eureka server交互的地址和注册服务都需要依赖这个地址 + defaultZone: http://eureka7002.com:7002/eureka/ #集群就是指向其他的eureka \ No newline at end of file diff --git a/payment-eureka-app/target/classes/application.yml b/payment-eureka-app/target/classes/application.yml new file mode 100644 index 0000000..e30b8c3 --- /dev/null +++ b/payment-eureka-app/target/classes/application.yml @@ -0,0 +1,11 @@ +server: + port: 7002 +eureka: + instance: + hostname: eureka7002.com #eureka服务端的实例名称 + client: + register-with-eureka: false #false表示不向注册中心注册自己。 + fetch-registry: false #false表示自己端就是注册中心，我的职责就是维护服务实例，并不需要去检索服务 + service-url: + #设置与eureka server交互的地址和注册服务都需要依赖这个地址 + defaultZone: http://eureka7002.com:7002/eureka/ #集群就是指向其他的eureka \ No newline at end of file diff --git a/payment-eureka-app/target/classes/com/eureka/server/springclould/EurekaServerApplication.class b/payment-eureka-app/target/classes/com/eureka/server/springclould/EurekaServerApplication.class new file mode 100644 index 0000000..5359c82 Binary files /dev/null and b/payment-eureka-app/target/classes/com/eureka/server/springclould/EurekaServerApplication.class differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..c2e8062 --- /dev/null +++ b/pom.xml @@ -0,0 +1,93 @@ + + + + 4.0.0 + + com.rbs.springcloud + rbsservice + + + pom + 1.0-SNAPSHOT + + payment-common-app + payment-base-app + rbs-eureka-server-app + payment-eureka-app + + + + UTF-8 + 1.8 + 1.8 + 5.1.47 + 1.1.10 + 4.1.2 + 1.16.10 + 1.2.17 + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Greenwich.SR1 + pom + import + + + + org.springframework.boot + spring-boot-dependencies + 2.1.4.RELEASE + pom + import + + + + mysql + mysql-connector-java + ${mysql.version} + + + com.alibaba + druid + ${druid.version} + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.2 + + + + junit + junit + 4.12 + + + + org.projectlombok + lombok + 1.18.8 + + + + + log4j + log4j + ${log4j.vsrsion} + + + ch.qos.logback + logback-core + 1.2.3 + + + + \ No newline at end of file diff --git a/rbs-payment.iml b/rbs-payment.iml new file mode 100644 index 0000000..78b2cc5 --- /dev/null +++ b/rbs-payment.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file