diff --git a/pom.xml b/pom.xml
index bf2d86f3..cdae3095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,21 @@
spring-boot-starter-aop
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+
+ org.springframework.boot
+ spring-boot-starter-mail
+
+
com.mysql
mysql-connector-j
@@ -132,12 +147,14 @@
${mybatis-plus.version}
+
com.github.xiaoymin
knife4j-openapi3-jakarta-spring-boot-starter
${knife4j.version}
+
org.mapstruct
mapstruct
@@ -150,25 +167,20 @@
${mapstruct.version}
+
com.xuxueli
xxl-job-core
${xxl-job.version}
+
cn.idev.excel
fastexcel
${fastexcel.version}
-
-
-
- org.springframework.boot
- spring-boot-starter-validation
-
-
io.minio
@@ -176,6 +188,7 @@
${minio.version}
+
com.aliyun.oss
aliyun-sdk-oss
@@ -189,34 +202,27 @@
${redisson.version}
-
- org.springframework.boot
- spring-boot-starter-websocket
-
-
+
com.baomidou
mybatis-plus-generator
${mybatis-plus-generator.version}
+
org.apache.velocity
velocity-engine-core
${velocity.version}
+
org.lionsoul
ip2region
${ip2region.version}
-
- org.springframework.boot
- spring-boot-starter-mail
-
-
com.aliyun
aliyun-java-sdk-core
@@ -235,6 +241,7 @@
${weixin-java.version}
+
com.github.ben-manes.caffeine
caffeine
diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java
index 1944d1b3..d0626ddb 100644
--- a/src/main/java/com/youlai/boot/system/controller/DictController.java
+++ b/src/main/java/com/youlai/boot/system/controller/DictController.java
@@ -170,9 +170,9 @@ public class DictController {
@DeleteMapping("/{dictCode}/items/{itemIds}")
@PreAuthorize("@ss.hasPerm('sys:dict-item:delete')")
public Result deleteDictItems(
- @Parameter(description = "字典ID,多个以英文逗号(,)拼接") @PathVariable String ids
+ @Parameter(description = "字典ID,多个以英文逗号(,)拼接") @PathVariable String itemIds
) {
- dictItemService.deleteDictItemByIds(ids);
+ dictItemService.deleteDictItemByIds(itemIds);
return Result.success();
}
diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java
index 6705f202..8c574612 100644
--- a/src/main/java/com/youlai/boot/system/controller/UserController.java
+++ b/src/main/java/com/youlai/boot/system/controller/UserController.java
@@ -19,7 +19,7 @@ import com.youlai.boot.system.model.dto.UserImportDTO;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.form.*;
import com.youlai.boot.system.model.query.UserPageQuery;
-import com.youlai.boot.system.model.vo.UserInfoVO;
+import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.service.UserService;
@@ -128,9 +128,9 @@ public class UserController {
@Operation(summary = "获取当前登录用户信息")
@GetMapping("/me")
@Log(value = "获取当前登录用户信息", module = LogModuleEnum.USER)
- public Result getCurrentUserInfo() {
- UserInfoVO userInfoVO = userService.getCurrentUserInfo();
- return Result.success(userInfoVO);
+ public Result getCurrentUser() {
+ CurrentUserDTO currentUserDTO = userService.getCurrentUser();
+ return Result.success(currentUserDTO);
}
@Operation(summary = "用户导入模板下载")
diff --git a/src/main/java/com/youlai/boot/system/converter/UserConverter.java b/src/main/java/com/youlai/boot/system/converter/UserConverter.java
index 2134c5e8..128d4773 100644
--- a/src/main/java/com/youlai/boot/system/converter/UserConverter.java
+++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java
@@ -3,7 +3,7 @@ package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.User;
-import com.youlai.boot.system.model.vo.UserInfoVO;
+import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.model.bo.UserBO;
@@ -38,12 +38,12 @@ public interface UserConverter {
@Mappings({
@Mapping(target = "userId", source = "id")
})
- UserInfoVO toUserInfoVo(User entity);
+ CurrentUserDTO toCurrentUserDto(User entity);
User toEntity(UserImportDTO vo);
- UserProfileVO toProfileVO(UserBO bo);
+ UserProfileVO toProfileVo(UserBO bo);
User toEntity(UserProfileForm formData);
diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java b/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java
similarity index 79%
rename from src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java
rename to src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java
index fc2d095d..e29bd22b 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java
+++ b/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java
@@ -1,4 +1,4 @@
-package com.youlai.boot.system.model.vo;
+package com.youlai.boot.system.model.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -6,14 +6,14 @@ import lombok.Data;
import java.util.Set;
/**
- * 用户登录视图对象
+ * 当前登录用户对象
*
* @author haoxr
* @since 2022/1/14
*/
-@Schema(description ="当前登录用户视图对象")
+@Schema(description ="当前登录用户对象")
@Data
-public class UserInfoVO {
+public class CurrentUserDTO {
@Schema(description="用户ID")
private Long userId;
diff --git a/src/main/java/com/youlai/boot/system/service/UserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java
index 400aeaaf..619f9d16 100644
--- a/src/main/java/com/youlai/boot/system/service/UserService.java
+++ b/src/main/java/com/youlai/boot/system/service/UserService.java
@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.core.security.model.AuthCredentials;
+import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.query.UserPageQuery;
-import com.youlai.boot.system.model.vo.UserInfoVO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.model.form.*;
@@ -87,9 +87,9 @@ public interface UserService extends IService {
/**
* 获取登录用户信息
*
- * @return {@link UserInfoVO} 登录用户信息
+ * @return {@link CurrentUserDTO} 登录用户信息
*/
- UserInfoVO getCurrentUserInfo();
+ CurrentUserDTO getCurrentUserInfo();
/**
* 获取个人中心用户信息
diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
index 31f219e6..37d8c0c8 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
@@ -23,13 +23,13 @@ import com.youlai.boot.system.enums.DictCodeEnum;
import com.youlai.boot.system.mapper.UserMapper;
import com.youlai.boot.system.model.bo.UserBO;
import com.youlai.boot.core.security.model.AuthCredentials;
+import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.entity.UserRole;
import com.youlai.boot.system.model.form.*;
import com.youlai.boot.system.model.query.UserPageQuery;
-import com.youlai.boot.system.model.vo.UserInfoVO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.service.*;
@@ -314,10 +314,10 @@ public class UserServiceImpl extends ServiceImpl implements Us
/**
* 获取登录用户信息
*
- * @return {@link UserInfoVO} 用户信息
+ * @return {@link CurrentUserDTO} 用户信息
*/
@Override
- public UserInfoVO getCurrentUserInfo() {
+ public CurrentUserDTO getCurrentUserInfo() {
String username = SecurityUtils.getUsername();
@@ -332,7 +332,7 @@ public class UserServiceImpl extends ServiceImpl implements Us
)
);
// entity->VO
- UserInfoVO userInfoVO = userConverter.toUserInfoVo(user);
+ CurrentUserDTO userInfoVO = userConverter.toCurrentUserDto(user);
// 用户角色集合
Set roles = SecurityUtils.getRoles();
@@ -355,7 +355,7 @@ public class UserServiceImpl extends ServiceImpl implements Us
@Override
public UserProfileVO getUserProfile(Long userId) {
UserBO entity = this.baseMapper.getUserProfile(userId);
- return userConverter.toProfileVO(entity);
+ return userConverter.toProfileVo(entity);
}
/**