diff --git a/online-taxi-public/.idea/compiler.xml b/online-taxi-public/.idea/compiler.xml index c25265c..23f23dd 100644 --- a/online-taxi-public/.idea/compiler.xml +++ b/online-taxi-public/.idea/compiler.xml @@ -15,6 +15,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/online-taxi-public/.idea/encodings.xml b/online-taxi-public/.idea/encodings.xml index 18cf9bf..a8220ba 100644 --- a/online-taxi-public/.idea/encodings.xml +++ b/online-taxi-public/.idea/encodings.xml @@ -2,6 +2,7 @@ + diff --git a/online-taxi-public/api-driver/pom.xml b/online-taxi-public/api-driver/pom.xml new file mode 100644 index 0000000..520e8b2 --- /dev/null +++ b/online-taxi-public/api-driver/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + com.taxi + online-taxi-public + 1.0-SNAPSHOT + + + api-driver + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + \ No newline at end of file diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/ApiDriverApplication.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/ApiDriverApplication.java new file mode 100644 index 0000000..6a40ff4 --- /dev/null +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/ApiDriverApplication.java @@ -0,0 +1,16 @@ +package com.taxi.apidriver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class ApiDriverApplication { + + public static void main(String[] args) { + SpringApplication.run(ApiDriverApplication.class); + } +} diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/controller/UserController.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/controller/UserController.java new file mode 100644 index 0000000..b500d27 --- /dev/null +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/controller/UserController.java @@ -0,0 +1,27 @@ +package com.taxi.apidriver.controller; + +import com.internal.dto.DriverUser; +import com.internal.dto.ResponseResult; +import com.taxi.apidriver.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + @Autowired + private UserService userService; + + @PostMapping("/users") + public ResponseResult addDriverUser(@RequestBody DriverUser driverUser){ + return userService.addDriverUser(driverUser); + } + + @PutMapping("/user") + public ResponseResult updateDriverUser(@RequestBody DriverUser driverUser){ + return userService.updateDriverUser(driverUser); + } + +} diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDirverUserClient.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDirverUserClient.java new file mode 100644 index 0000000..8944a58 --- /dev/null +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDirverUserClient.java @@ -0,0 +1,19 @@ +package com.taxi.apidriver.remote; + +import com.internal.dto.DriverUser; +import com.internal.dto.ResponseResult; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +@FeignClient("service-driver-user") +public interface ServiceDirverUserClient { + + @RequestMapping(method = RequestMethod.POST,value = "/users") + ResponseResult addDriverUser(@RequestBody DriverUser driverUser); + + @RequestMapping(method = RequestMethod.PUT,value = "/user") + ResponseResult updateDriverUser(@RequestBody DriverUser driverUser); + +} diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/UserService.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/UserService.java new file mode 100644 index 0000000..b07750c --- /dev/null +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/UserService.java @@ -0,0 +1,25 @@ +package com.taxi.apidriver.service; + +import com.internal.dto.DriverUser; +import com.internal.dto.ResponseResult; +import com.taxi.apidriver.remote.ServiceDirverUserClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Service +public class UserService { + + @Autowired + private ServiceDirverUserClient serviceDirverUserClient; + + public ResponseResult addDriverUser(DriverUser driverUser) { + return serviceDirverUserClient.addDriverUser(driverUser); + } + + @PutMapping("/users") + public ResponseResult updateDriverUser(DriverUser driverUser) { + return serviceDirverUserClient.updateDriverUser(driverUser); + } +} diff --git a/online-taxi-public/api-driver/src/main/resources/application.yaml b/online-taxi-public/api-driver/src/main/resources/application.yaml new file mode 100644 index 0000000..188c4f4 --- /dev/null +++ b/online-taxi-public/api-driver/src/main/resources/application.yaml @@ -0,0 +1,11 @@ +server: + port: 8088 + +spring: + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + + application: + name: api-driver diff --git a/online-taxi-public/api-driver/target/classes/application.yaml b/online-taxi-public/api-driver/target/classes/application.yaml new file mode 100644 index 0000000..188c4f4 --- /dev/null +++ b/online-taxi-public/api-driver/target/classes/application.yaml @@ -0,0 +1,11 @@ +server: + port: 8088 + +spring: + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + + application: + name: api-driver diff --git a/online-taxi-public/pom.xml b/online-taxi-public/pom.xml index 6ffb5c5..7c356e2 100644 --- a/online-taxi-public/pom.xml +++ b/online-taxi-public/pom.xml @@ -23,6 +23,7 @@ service-map service-driver-user api-boss + api-driver diff --git a/online-taxi-public/端口管理.md b/online-taxi-public/端口管理.md index 09ad79b..f3663ac 100644 --- a/online-taxi-public/端口管理.md +++ b/online-taxi-public/端口管理.md @@ -9,6 +9,7 @@ service-price|8084 service-map|8085 service-driver-user|8086 api-boss|8087 +api-driver|8088