Commit dbce23d1 authored by liuzijian's avatar liuzijian

add

parent fd905b5e
...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date;
@Data @Data
@ApiModel(value = "用户信息") @ApiModel(value = "用户信息")
...@@ -17,4 +18,5 @@ public class User { ...@@ -17,4 +18,5 @@ public class User {
@ApiModelProperty(value = "年龄") @ApiModelProperty(value = "年龄")
private Integer age; private Integer age;
private Date birthday;
} }
...@@ -51,6 +51,11 @@ public class Demo1Controller { ...@@ -51,6 +51,11 @@ public class Demo1Controller {
return userApi.get(name); return userApi.get(name);
} }
@GetMapping("/user/get/v2")
public User userGetV2(@RequestParam("name") String name) {
return restTemplate.getForObject("http://unififi-demo2-service/user/get?name=demoData", User.class);
}
@GetMapping(value = "/user/list") @GetMapping(value = "/user/list")
public List<User> userList() { public List<User> userList() {
// return userApi.list(); // return userApi.list();
......
...@@ -36,6 +36,6 @@ spring: ...@@ -36,6 +36,6 @@ spring:
unififi.env: ${spring.profiles.active} unififi.env: ${spring.profiles.active}
rocketmq: rocketmq:
name-server: 192.168.228.100:9876 name-server: 39.106.6.97:9876
producer: producer:
group: unififi-demo1-service group: unififi-demo1-service
\ No newline at end of file
...@@ -22,14 +22,14 @@ public class TestMQ { ...@@ -22,14 +22,14 @@ public class TestMQ {
@Test @Test
public void sendSimple() { public void sendSimple() {
TicketingOrder order = new TicketingOrder(); TicketingOrder order = new TicketingOrder();
order.setOrderNo("ticketing"); order.setOrderNo("ticketing11111111111");
rocketMQTemplate.convertAndSend("order-push:ticketing", order); rocketMQTemplate.convertAndSend("order-push:ticketing", order);
} }
@Test @Test
public void sendSimple2() { public void sendSimple2() {
RefundOrder order = new RefundOrder(); RefundOrder order = new RefundOrder();
order.setOrderNo("refund"); order.setOrderNo("refund222222222222");
Message<RefundOrder> message = MessageBuilder.withPayload(order) Message<RefundOrder> message = MessageBuilder.withPayload(order)
.setHeader(MessageConst.PROPERTY_KEYS, "key") .setHeader(MessageConst.PROPERTY_KEYS, "key")
.build(); .build();
...@@ -39,7 +39,7 @@ public class TestMQ { ...@@ -39,7 +39,7 @@ public class TestMQ {
@Test @Test
public void sendSimple3() { public void sendSimple3() {
ChangeOrder order = new ChangeOrder(); ChangeOrder order = new ChangeOrder();
order.setOrderNo("change"); order.setOrderNo("change333333333333");
rocketMQTemplate.convertAndSend("order-push:change", order); rocketMQTemplate.convertAndSend("order-push:change", order);
} }
} }
...@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List; import java.util.List;
@RestController @RestController
...@@ -51,7 +52,9 @@ public class Demo2Controller implements UserApi { ...@@ -51,7 +52,9 @@ public class Demo2Controller implements UserApi {
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
return userService.get(name); User user = userService.get(name);
user.setBirthday(new Date());
return user;
} }
@GetMapping("/config/username") @GetMapping("/config/username")
......
...@@ -71,7 +71,7 @@ public class UserServiceImpl implements UserService { ...@@ -71,7 +71,7 @@ public class UserServiceImpl implements UserService {
public User get(String name) { public User get(String name) {
// return USERS.stream().filter(u -> name.equals(u.getName())).collect(Collectors.toList()).get(0); // return USERS.stream().filter(u -> name.equals(u.getName())).collect(Collectors.toList()).get(0);
QueryWrapper<DemoUser> queryWrapper = new QueryWrapper<>(); QueryWrapper<DemoUser> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name", name); queryWrapper.lambda().eq(DemoUser::getName, name);
DemoUser userEntity = demoUserMapper.selectOne(queryWrapper); DemoUser userEntity = demoUserMapper.selectOne(queryWrapper);
User user = new User(); User user = new User();
BeanUtils.copyProperties(userEntity, user); BeanUtils.copyProperties(userEntity, user);
......
...@@ -35,6 +35,6 @@ spring: ...@@ -35,6 +35,6 @@ spring:
user.home: ${user.home} user.home: ${user.home}
rocketmq: rocketmq:
name-server: 192.168.228.100:9876 name-server: 39.106.6.97:9876
producer: producer:
group: unififi-demo2-service group: unififi-demo2-service
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment