diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/BusUserVo.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/BusUserVo.java new file mode 100644 index 0000000..0b56225 --- /dev/null +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/BusUserVo.java @@ -0,0 +1,22 @@ +package me.zhengjie.modules.front.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(value="LoginVo", description="用户登录返回数据") +public class BusUserVo implements Serializable { + + @ApiModelProperty(value = "用户昵称") + private String nickname; + + @ApiModelProperty(value = "用户头像") + private String avatar; + + @ApiModelProperty(value = "手机号码") + private String phone; + +} diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/DeviceLogCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/DeviceLogCriteria.java index 254add2..a8d606b 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/DeviceLogCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/DeviceLogCriteria.java @@ -3,8 +3,10 @@ package me.zhengjie.modules.front.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class DeviceLogCriteria { +public class DeviceLogCriteria implements Serializable { @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/LoginVo.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/LoginVo.java index 94485e9..da0efe9 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/LoginVo.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/LoginVo.java @@ -4,9 +4,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data @ApiModel(value="LoginVo", description="用户登录返回数据") -public class LoginVo { +public class LoginVo implements Serializable { @ApiModelProperty(value = "用户登录密钥") private String token; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/MyDeviceCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/MyDeviceCriteria.java index 7adfaa0..140aca7 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/MyDeviceCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/MyDeviceCriteria.java @@ -3,8 +3,10 @@ package me.zhengjie.modules.front.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class MyDeviceCriteria { +public class MyDeviceCriteria implements Serializable { @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/WeChatMiniAuthorizeVo.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/WeChatMiniAuthorizeVo.java index f41ea7c..93e6ea8 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/WeChatMiniAuthorizeVo.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/domain/dto/WeChatMiniAuthorizeVo.java @@ -4,8 +4,10 @@ import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class WeChatMiniAuthorizeVo { +public class WeChatMiniAuthorizeVo implements Serializable { @ApiModelProperty(value = "会话密钥") @JSONField(name = "session_key") diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java index 9e5f7dd..2da8a21 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import me.zhengjie.annotation.Log; import me.zhengjie.config.properties.FileProperties; import me.zhengjie.exception.BadRequestException; +import me.zhengjie.modules.front.domain.dto.BusUserVo; import me.zhengjie.modules.front.domain.dto.LoginVo; import me.zhengjie.modules.front.domain.dto.MyDeviceCriteria; import me.zhengjie.modules.security.service.dto.JwtUserDto; @@ -21,6 +22,7 @@ import me.zhengjie.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -63,13 +65,13 @@ public class BusUserController { @Log("信息修改") @ApiOperation("修改用户信息") @PostMapping(value = "/update") - public ResponseEntity updateInfo() { + public ResponseEntity updateInfo(@Validated @RequestBody BusUserVo user) { JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser(); BusUser upd = new BusUser(); upd.setId(jwtUser.getUser().getId()); - upd.setAvatar(jwtUser.getUser().getAvatarPath()); - upd.setNickname(jwtUser.getUser().getNickName()); - upd.setPhone(jwtUser.getUser().getPhone()); + upd.setAvatar(user.getAvatar()); + upd.setNickname(user.getNickname()); + upd.setPhone(user.getPhone()); busUserService.updateById(upd); return new ResponseEntity<>("修改成功", HttpStatus.OK); }