Skip to content

Commit dd448a8

Browse files
committed
feat: 后缀 dto 改为 vo
1 parent ce5004d commit dd448a8

3 files changed

Lines changed: 16 additions & 15 deletions

File tree

framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/bean/dto/SysUserDto.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package com.github.cadecode.uniboot.framework.api.bean.dto;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.github.cadecode.uniboot.framework.api.bean.vo.SysMenuVo.SysMenuTreeVo;
5-
import lombok.AllArgsConstructor;
6-
import lombok.Builder;
74
import lombok.Data;
8-
import lombok.NoArgsConstructor;
95
import org.springframework.security.core.GrantedAuthority;
106
import org.springframework.security.core.authority.SimpleGrantedAuthority;
117
import org.springframework.security.core.userdetails.UserDetails;
@@ -83,12 +79,4 @@ public boolean isEnabled() {
8379
return true;
8480
}
8581
}
86-
87-
@Data
88-
@AllArgsConstructor
89-
@NoArgsConstructor
90-
@Builder
91-
public static class SysUserInfoDto {
92-
private List<SysMenuTreeVo> menuList;
93-
}
9482
}

framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/bean/vo/SysUserVo.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package com.github.cadecode.uniboot.framework.api.bean.vo;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
4+
import com.github.cadecode.uniboot.framework.api.bean.vo.SysMenuVo.SysMenuTreeVo;
5+
import lombok.AllArgsConstructor;
6+
import lombok.Builder;
47
import lombok.Data;
8+
import lombok.NoArgsConstructor;
59

610
import java.util.Date;
711
import java.util.List;
@@ -46,4 +50,13 @@ public static class SysUserRolesVo {
4650

4751
private List<String> roles;
4852
}
53+
54+
55+
@Data
56+
@AllArgsConstructor
57+
@NoArgsConstructor
58+
@Builder
59+
public static class SysUserInfoVo {
60+
private List<SysMenuTreeVo> menuList;
61+
}
4962
}

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/controller/SysUserController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import com.github.cadecode.uniboot.common.core.web.response.PageResult;
66
import com.github.cadecode.uniboot.framework.api.annotation.ApiFormat;
77
import com.github.cadecode.uniboot.framework.api.bean.dto.SysUserDto.SysUserDetailsDto;
8-
import com.github.cadecode.uniboot.framework.api.bean.dto.SysUserDto.SysUserInfoDto;
98
import com.github.cadecode.uniboot.framework.api.bean.po.SysUser;
109
import com.github.cadecode.uniboot.framework.api.bean.vo.SysMenuVo.SysMenuTreeVo;
10+
import com.github.cadecode.uniboot.framework.api.bean.vo.SysUserVo.SysUserInfoVo;
1111
import com.github.cadecode.uniboot.framework.api.bean.vo.SysUserVo.SysUserRolesVo;
1212
import com.github.cadecode.uniboot.framework.api.convert.SysUserConvert;
1313
import com.github.cadecode.uniboot.framework.api.request.SysUserRequest;
@@ -58,10 +58,10 @@ public class SysUserController {
5858
*/
5959
@ApiOperation("获取用户信息")
6060
@PostMapping("get_info")
61-
public SysUserInfoDto getInfo() {
61+
public SysUserInfoVo getInfo() {
6262
SysUserDetailsDto userDetails = SecurityUtil.getUserDetails(null);
6363
List<SysMenuTreeVo> sysMenuTreeVos = sysMenuService.listTreeVoByRoles(userDetails.getRoles());
64-
return SysUserInfoDto.builder().menuList(sysMenuTreeVos).build();
64+
return SysUserInfoVo.builder().menuList(sysMenuTreeVos).build();
6565
}
6666

6767
@ApiOperation("修改用户信息(用户中心)")

0 commit comments

Comments
 (0)