diff --git a/.gitignore b/.gitignore index 2a7d5ba3db432ab64a5615b8cbedb05357d3adcf..8e02a3f64f4de5f724a50aa28f3c2f07f4544fbd 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,9 @@ fabric.properties .idea/ cloud-provider-payment8001/src/test/ cloud-provider-payment8001/target/ +cloud-consumer-order80/target/ +cloud-consumer-order80/cloud-consumer-order80.iml +cloud-consumer-order80/src/test/ +cloud-api-commons/cloud-api-commons.iml +cloud-api-commons/target/ +cloud-api-commons/src/test/ \ No newline at end of file diff --git a/cloud-api-commons/pom.xml b/cloud-api-commons/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..359b6cb9810a621dfce386ff9ce9ab7ec5799738 --- /dev/null +++ b/cloud-api-commons/pom.xml @@ -0,0 +1,33 @@ + + + + 2020SpringCloud + com.lcry + 1.0-SNAPSHOT + + 4.0.0 + + cloud-api-commons + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.projectlombok + lombok + true + + + + cn.hutool + hutool-all + 5.1.0 + + + \ No newline at end of file diff --git a/cloud-consumer-order80/pom.xml b/cloud-consumer-order80/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..83a83b50f3ac1406bccbb6d67466925c237718a4 --- /dev/null +++ b/cloud-consumer-order80/pom.xml @@ -0,0 +1,47 @@ + + + + 2020SpringCloud + com.lcry + 1.0-SNAPSHOT + + 4.0.0 + + + cloud-consumer-order80 + + + + + com.lcry + cloud-api-commons + ${project.version} + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + + 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/cloud-consumer-order80/src/main/java/com/lcry/springcloud/OrderMain80.java b/cloud-consumer-order80/src/main/java/com/lcry/springcloud/OrderMain80.java new file mode 100644 index 0000000000000000000000000000000000000000..a21ae997efdd23b293e60db815864dbe62ec0646 --- /dev/null +++ b/cloud-consumer-order80/src/main/java/com/lcry/springcloud/OrderMain80.java @@ -0,0 +1,17 @@ +package com.lcry.springcloud; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * OrderMain80 + * + * @author lcry + * @date 2020/03/14 11:59 + */ +@SpringBootApplication +public class OrderMain80 { + public static void main(String[] args) { + SpringApplication.run(OrderMain80.class, args); + } +} diff --git a/cloud-consumer-order80/src/main/java/com/lcry/springcloud/config/ApplicationContextConfig.java b/cloud-consumer-order80/src/main/java/com/lcry/springcloud/config/ApplicationContextConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..0e30588ee8873e2e7ca80fc30113eeef0548504a --- /dev/null +++ b/cloud-consumer-order80/src/main/java/com/lcry/springcloud/config/ApplicationContextConfig.java @@ -0,0 +1,20 @@ +package com.lcry.springcloud.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +/** + * ApplicationContextConfig + * + * @author lcry + * @date 2020/03/14 12:05 + * 配置RestTemplate + */ +@Configuration +public class ApplicationContextConfig { + @Bean //相当于Spring中applicationContext.xml中 + public RestTemplate getRestTemplate() { + return new RestTemplate(); + } +} diff --git a/cloud-consumer-order80/src/main/java/com/lcry/springcloud/controller/OrderController.java b/cloud-consumer-order80/src/main/java/com/lcry/springcloud/controller/OrderController.java new file mode 100644 index 0000000000000000000000000000000000000000..489e3feb637b356e56e65124bc0e1add70f2da43 --- /dev/null +++ b/cloud-consumer-order80/src/main/java/com/lcry/springcloud/controller/OrderController.java @@ -0,0 +1,36 @@ +package com.lcry.springcloud.controller; + +import com.lcry.springcloud.entities.CommonResult; +import com.lcry.springcloud.entities.Payment; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; + +/** + * OrderController + * + * @author lcry + * @date 2020/03/14 12:02 + */ +@RestController +@Slf4j +public class OrderController { + public static final String PAYMENT_URL = "http://localhost:8001"; + + @Resource + private RestTemplate restTemplate; + + @GetMapping("/consumer/payment/create") + public CommonResult create(Payment payment) { + return restTemplate.postForObject(PAYMENT_URL + "/payment/create", payment, CommonResult.class); + } + + @GetMapping("/consumer/payment/get/{id}") + public CommonResult getPayment(@PathVariable("id") Long id) { + return restTemplate.getForObject(PAYMENT_URL + "/payment/get/" + id, CommonResult.class); + } +} diff --git a/cloud-consumer-order80/src/main/resources/application.yml b/cloud-consumer-order80/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..ff04e0d5b53a7bcecc3114cd1ae31e08b69bd694 --- /dev/null +++ b/cloud-consumer-order80/src/main/resources/application.yml @@ -0,0 +1,6 @@ +server: + port: 80 + +spring: + application: + name: cloud-order-service \ No newline at end of file diff --git a/cloud-provider-payment8001/pom.xml b/cloud-provider-payment8001/pom.xml index 95a91a722c27d1efb23343ecb6cffc120956b1c2..9a6965a3ae7438507000d389636bb5428daf2be6 100644 --- a/cloud-provider-payment8001/pom.xml +++ b/cloud-provider-payment8001/pom.xml @@ -13,6 +13,12 @@ cloud-provider-payment8001 + + + com.lcry + cloud-api-commons + ${project.version} + org.springframework.boot spring-boot-starter-web diff --git a/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/controller/PaymentController.java b/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/controller/PaymentController.java index 48eadcbd4cc9551a36bf619e190fdd95e1f5661b..3bbeb2fa59db5ee9e3cad6e002e47609a4108193 100644 --- a/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/controller/PaymentController.java +++ b/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/controller/PaymentController.java @@ -4,10 +4,7 @@ import com.lcry.springcloud.entities.CommonResult; import com.lcry.springcloud.entities.Payment; import com.lcry.springcloud.service.PaymentService; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -25,7 +22,7 @@ public class PaymentController { private PaymentService paymentService; @PostMapping(value = "/payment/create") - public CommonResult create(Payment payment) { + public CommonResult create(@RequestBody Payment payment) { int result = paymentService.create(payment); log.info("插入结果:" + result); diff --git a/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/entities/CommonResult.java b/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/entities/CommonResult.java deleted file mode 100644 index aaa5781d13032df70f5dfcc435ba46839762bf6b..0000000000000000000000000000000000000000 --- a/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/entities/CommonResult.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lcry.springcloud.entities; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * CommonResult - * - * @author lcry - * @date 2020/03/13 21:31 - * 公共返回结果集 - */ -@Data -@AllArgsConstructor //全参构造器 -@NoArgsConstructor //空参构造器 -public class CommonResult { - - /** - * 状态码:200成功 - */ - private Integer code; - /** - * 响应信息 - */ - private String message; - /** - * 响应数据 - */ - private T data; - - public CommonResult(Integer code, String message) { - this(code, message, null); - } -} diff --git a/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/entities/Payment.java b/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/entities/Payment.java deleted file mode 100644 index 5d62b2afebcfcee70c7486871057283281acfb1c..0000000000000000000000000000000000000000 --- a/cloud-provider-payment8001/src/main/java/com/lcry/springcloud/entities/Payment.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lcry.springcloud.entities; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * Payment - * - * @author lcry - * @date 2020/03/13 21:26 - * 支付实体类 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Payment implements Serializable { - /** - * 主键id - */ - private Long id; - /** - * 流水号 - */ - private String serial; -} diff --git a/pom.xml b/pom.xml index 942155de52750f0c320a35de041cec4992535fdf..21f46db99f1be85893150bc568a96759799c6517 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,8 @@ 1.0-SNAPSHOT cloud-provider-payment8001 + cloud-consumer-order80 + cloud-api-commons pom