diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index 46f7269..3184351 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/ConsumeController.java @@ -6,10 +6,7 @@ import com.example.demo.service.ConsumeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -32,7 +29,7 @@ public class ConsumeController { @Autowired private ConsumeService consumeService; - @GetMapping("/selectAll") + @PostMapping("/selectAll") public Result selcetAll() { List consumes = consumeService.selectAll(); diff --git a/src/main/java/com/example/demo/domain/vo/Consume.java b/src/main/java/com/example/demo/domain/vo/Consume.java index c6f6166..6dc01b2 100644 --- a/src/main/java/com/example/demo/domain/vo/Consume.java +++ b/src/main/java/com/example/demo/domain/vo/Consume.java @@ -29,7 +29,7 @@ public class Consume implements Serializable { private Integer freeGold; // 免费金币 private Integer taskGold; // 任务金币 private String remark; // 备注 - private Integer adminName; //提交人姓名 + private String adminName; //提交人姓名 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date payTime; // 消费时间 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6d9081f..6d2229c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: fail-on-unknown-properties: false datasource: mysql1: - jdbc-url: jdbc:mysql://localhost:3306/hwgold?serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.8.220:3306/hwgold?serverTimezone=Asia/Shanghai username: hwgold password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver @@ -91,7 +91,7 @@ upload: server: - port: 8080 + port: 8081 logging: level: