From b1151f8be1da9dfa4c2db46474268d847949ce5c Mon Sep 17 00:00:00 2001 From: yang_shj Date: Tue, 1 Mar 2022 14:32:21 +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 --- payment-base-app/pom.xml | 1 - .../service/imp/MerchantServiceImp.java | 4 +- .../src/main/resources/application.yml | 19 ++------- payment-eureka-app/pom.xml | 40 ------------------ .../springclould/EurekaServerApplication.java | 14 ------ .../src/main/resources/application.yml | 11 ----- .../target/classes/application.yml | 11 ----- .../EurekaServerApplication.class | Bin 830 -> 0 bytes pom.xml | 1 - 9 files changed, 5 insertions(+), 96 deletions(-) delete mode 100644 payment-eureka-app/pom.xml delete mode 100644 payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java delete mode 100644 payment-eureka-app/src/main/resources/application.yml delete mode 100644 payment-eureka-app/target/classes/application.yml delete mode 100644 payment-eureka-app/target/classes/com/eureka/server/springclould/EurekaServerApplication.class diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml index 79035d9..aca31c0 100644 --- a/payment-base-app/pom.xml +++ b/payment-base-app/pom.xml @@ -196,7 +196,6 @@ - maven-public diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java index 8b23617..c42dac0 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java @@ -187,7 +187,7 @@ public class MerchantServiceImp implements MerchantService { return null; } - /*public static void main(String[] args) { + public static void main(String[] args) { WxpayTradeVo wxpayTradeVo = new WxpayTradeVo(); wxpayTradeVo.setAppid("wxa91984b310053c3d"); wxpayTradeVo.setMchid("1610494969"); @@ -203,5 +203,5 @@ public class MerchantServiceImp implements MerchantService { "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"); - }*/ + } } \ No newline at end of file diff --git a/payment-base-app/src/main/resources/application.yml b/payment-base-app/src/main/resources/application.yml index 5e60d42..cee0927 100644 --- a/payment-base-app/src/main/resources/application.yml +++ b/payment-base-app/src/main/resources/application.yml @@ -1,20 +1,7 @@ server: - port: 8001 #服务端口 -#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 + port: 5080 #服务端口 + servlet: + context-path: rbs-pay #spring相关配置 spring: application: diff --git a/payment-eureka-app/pom.xml b/payment-eureka-app/pom.xml deleted file mode 100644 index 53cb921..0000000 --- a/payment-eureka-app/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 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 deleted file mode 100644 index 01d2dfd..0000000 --- a/payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index e30b8c3..0000000 --- a/payment-eureka-app/src/main/resources/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index e30b8c3..0000000 --- a/payment-eureka-app/target/classes/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 5359c8227498e9759254686547a7ecfa22fb0b78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 830 zcmbVKO>Yx15PeS5Zdd{>DJ>Mrfm@mbzMu+et4eJsrxi#9g##z=#@V{vwIi>$^lxzj z^}r9{M;qy&^+*p)o;d-L^X{OkA4PXMp+B1RiK5q4ud!P5wP3>!yED|gJW);}0C zw1;LQ88%a;<@=_}r2Qnal8|0%a#4 zf+X-!5Oqq#-zwg&OyI>&xR!2Os_TEobEf?mms?J{SjPs#;s4Dt!m}=(W1nGbF~|?u zh0Gnp;7)zFik8&SL$D2PBSN-PbYYZ7QILR zwZOc3IwQJqvW)Ed;5*p2KzHc$G;oi8pnL0p821C##REco@L@;>bb77953GG&#K*+= b$cTIwIXZZVO~PB)3g;vA$a>#xvX6m3%2(!$ diff --git a/pom.xml b/pom.xml index 4133b22..10f5792 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ 1.0-SNAPSHOT payment-base-app - payment-eureka-app