From 38d85ae1958fadfe2dfb267b8790a8984d2cf3ac Mon Sep 17 00:00:00 2001 From: caolin <1149034574@qq.com> Date: Sun, 13 Aug 2023 16:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=80=BC=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driver/server/controller/TdSysConfigController.java | 2 +- .../server/controller/TdSysConfigListController.java | 4 ++-- .../jwl/driver/server/controller/TdSysUserController.java | 2 -- src/main/java/com/jwl/driver/server/entity/TdSysUser.java | 7 +++++++ src/main/resources/application-dev.yml | 2 +- src/main/resources/application-prod.yml | 2 +- src/main/resources/application-test.yml | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/jwl/driver/server/controller/TdSysConfigController.java b/src/main/java/com/jwl/driver/server/controller/TdSysConfigController.java index 4a5c085..820ae81 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdSysConfigController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdSysConfigController.java @@ -55,7 +55,7 @@ public class TdSysConfigController { * 根据配置keys和carTypeId获取配置信息,配置与车型无关则carTypeId为-1 */ @ApiOperation("根据配置keys和carTypeId获取配置信息,配置与车型无关则carTypeId为-1") - @PostMapping(value = "/queryConfigByKeys") + @GetMapping(value = "/queryConfigByKeys") public BaseResponse> queryConfigByKeys(@RequestParam("configKeys") String configKeys, @RequestParam("carTypeId") Integer carTypeId) { return BaseResponse.success(configService.queryConfigByKeys(Arrays.asList(configKeys.split(",")),carTypeId)); diff --git a/src/main/java/com/jwl/driver/server/controller/TdSysConfigListController.java b/src/main/java/com/jwl/driver/server/controller/TdSysConfigListController.java index 29f5ee1..8ceed30 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdSysConfigListController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdSysConfigListController.java @@ -39,7 +39,7 @@ public class TdSysConfigListController { * 根据configKey和carTypeId查询系统配置列表 */ @ApiOperation("根据configKey和carTypeId查询系统配置列表") - @PostMapping("/querySysConfigList") + @GetMapping("/querySysConfigList") public BaseResponse querySysConfigList(@RequestParam("configKey") String configKey, @RequestParam("carTypeId") Integer carTypeId) { log.info("request to querySysConfigList ：{}", configKey); List resultList = configListService.querySysConfigList(configKey, carTypeId); @@ -50,7 +50,7 @@ public class TdSysConfigListController { * 通过多个配置key 和 carTypeId 查询多个配置列表 */ @ApiOperation("通过多个配置key 和 carTypeId 查询多个配置列表") - @PostMapping("/querySysConfigMap") + @GetMapping("/querySysConfigMap") public BaseResponse querySysConfigMap(@RequestParam("configKey") String configKeys, @RequestParam("carTypeId") Integer carTypeId) { log.info("request to querySysConfigList ：{}", configKeys); Map> map = configListService.querySysConfigMap(Arrays.asList(configKeys.split(",")), carTypeId); diff --git a/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java b/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java index d19acde..d4842e5 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java @@ -39,7 +39,6 @@ public class TdSysUserController { return BaseResponse.success(userService.code(phone)); } - @ApiOperation("用户登陆") @PostMapping("/login") public BaseResponse login(@RequestBody @Valid LoginUserDto loginUserDto) { @@ -47,7 +46,6 @@ public class TdSysUserController { return BaseResponse.success(userService.login(loginUserDto)); } - @ApiOperation("用户登出") @GetMapping("/loginOut") public BaseResponse loginOut(){ diff --git a/src/main/java/com/jwl/driver/server/entity/TdSysUser.java b/src/main/java/com/jwl/driver/server/entity/TdSysUser.java index 5347619..f6234de 100644 --- a/src/main/java/com/jwl/driver/server/entity/TdSysUser.java +++ b/src/main/java/com/jwl/driver/server/entity/TdSysUser.java @@ -5,6 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -64,6 +69,8 @@ public class TdSysUser implements Serializable { * 创建时间 */ @TableField("CREATE_TIME") + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime createTime; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 47d32a5..e91e46f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -10,7 +10,7 @@ spring: # 数据库 配置 datasource: - url: jdbc:mysql://127.0.0.1:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&failOverReadOnly=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai username: root password: 123456 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index f914677..532b970 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -9,6 +9,6 @@ spring: # 数据库 配置 datasource: - url: jdbc:mysql://118.31.23.45:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&failOverReadOnly=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.31.23.45:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai username: root password: admin231280 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index f914677..532b970 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -9,6 +9,6 @@ spring: # 数据库 配置 datasource: - url: jdbc:mysql://118.31.23.45:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&failOverReadOnly=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.31.23.45:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai username: root password: admin231280