diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml
index 991bdbc1..dc5b6576 100644
--- a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml
+++ b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml
@@ -50,6 +50,13 @@
+
+
+ cn.iocoder.springboot.labs
+ labx-07-sca-dubbo-demo02-api
+ 1.0-SNAPSHOT
+
+
org.springframework.boot
@@ -73,13 +80,6 @@
org.springframework.cloud
spring-cloud-starter-openfeign
-
-
- cn.iocoder.springboot.labs
- labx-07-sca-dubbo-demo02-api
- 1.0-SNAPSHOT
-
-
diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java
index 1092d3ba..b5b7677c 100644
--- a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java
+++ b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(name = "demo-provider")
@DubboTransported(protocol = "dubbo")
-//@DubboTransported(protocol = "rest")
+// @DubboTransported(protocol = "rest")
public interface UserFeignClient {
/**
diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml
index 1641e052..df1102db 100644
--- a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml
+++ b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml
@@ -77,7 +77,8 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
-
+
+
jsr311-api
javax.ws.rs
@@ -91,7 +92,7 @@
spring-cloud-starter-dubbo
-
+
org.jboss.resteasy
resteasy-netty4
diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java
index 4b9d7321..ba69bcb0 100644
--- a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java
+++ b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java
@@ -10,12 +10,12 @@ import javax.ws.rs.core.MediaType;
import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE;
@org.apache.dubbo.config.annotation.Service(version = "1.0.0", protocol = {"dubbo", "rest"})
-@Path("/")
+@Path("/user")
public class UserServiceImpl implements UserService {
@Override
@GET
- @Path("/user/get")
+ @Path("/get")
@Produces(APPLICATION_JSON_VALUE)
public UserDTO get(@QueryParam("id") Integer id) {
return new UserDTO().setId(id)
@@ -25,7 +25,7 @@ public class UserServiceImpl implements UserService {
@Override
@POST
- @Path("/user/add")
+ @Path("/add")
@Consumes(MediaType.APPLICATION_JSON)
public Integer add(UserAddDTO addDTO) {
return (int) (System.currentTimeMillis() / 1000); // 嘿嘿,随便返回一个 id
diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java
index 3878d186..2099ddb3 100644
--- a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java
+++ b/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java
@@ -7,10 +7,11 @@ import org.springframework.web.bind.annotation.*;
@org.apache.dubbo.config.annotation.Service(version = "1.0.0", protocol = {"dubbo"})
@RestController
+@RequestMapping("/user")
public class UserServiceImpl implements UserService {
@Override
- @GetMapping("/user/get")
+ @GetMapping("/get")
public UserDTO get(@RequestParam("id") Integer id) {
return new UserDTO().setId(id)
.setName("没有昵称:" + id)
@@ -18,7 +19,7 @@ public class UserServiceImpl implements UserService {
}
@Override
- @PostMapping("/user/add")
+ @PostMapping("/add")
public Integer add(@RequestBody UserAddDTO addDTO) {
return (int) (System.currentTimeMillis() / 1000); // 嘿嘿,随便返回一个 id
}