From d194e1478040c857bcbf629ab7f53551915d6f81 Mon Sep 17 00:00:00 2001
From: niudehua <657563945@qq.com>
Date: Fri, 15 Oct 2021 21:16:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9maven=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-core-service/pom.xml | 2 +-
yudao-user-server/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/yudao-core-service/pom.xml b/yudao-core-service/pom.xml
index 3ce350b54..43cdae127 100644
--- a/yudao-core-service/pom.xml
+++ b/yudao-core-service/pom.xml
@@ -12,7 +12,7 @@
<artifactId>yudao-core-service</artifactId>
<packaging>jar</packaging>
- <name>yudao-admin-server</name>
+ <name>yudao-core-service</name>
<description>
公共服务，通过 jar 包的方式，被 yudao-admin-server、yudao-user-service 使用。例如说：
1. 日志相关：访问日志、登录日志、异常日志等等
diff --git a/yudao-user-server/pom.xml b/yudao-user-server/pom.xml
index fe55b34f9..2aa1ee772 100644
--- a/yudao-user-server/pom.xml
+++ b/yudao-user-server/pom.xml
@@ -12,7 +12,7 @@
<artifactId>yudao-user-server</artifactId>
<packaging>jar</packaging>
- <name>yudao-admin-server</name>
+ <name>yudao-user-server</name>
<description>用户前台 Server，提供其 API 接口</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
From c06d6e53f60f1ff0719d3ef80adab4a36adf8981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=A4=A9?= <2982176321@qq.com>
Date: Tue, 19 Oct 2021 22:16:42 +0800
Subject: [PATCH 2/6] =?UTF-8?q?[update]=20=E6=96=B0=E5=A2=9E=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E6=98=B5=E7=A7=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A4=B4?=
=?UTF-8?q?=E5=83=8F=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=98=B5=E7=A7=B0=E4=B8=8E?=
=?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/file/InfFileController.java | 8 +--
.../infra/convert/file/InfFileConvert.java | 2 +-
.../infra/dal/mysql/file/InfFileMapper.java | 25 --------
.../infra/enums/InfErrorCodeConstants.java | 3 -
.../service/user/impl/SysUserServiceImpl.java | 4 +-
.../service/file/InfFileServiceTest.java | 16 ++---
.../service/user/SysUserServiceImplTest.java | 4 +-
.../dal/mysql/file/InfFileCoreMapper.java | 14 +++++
.../infra}/file/vo/InfFilePageReqVO.java | 2 +-
.../modules/infra}/file/vo/InfFileRespVO.java | 2 +-
.../file/config/FileConfiguration.java | 2 +-
.../framework/file/config/FileProperties.java | 2 +-
.../infra/framework/file/package-info.java | 2 +-
.../service/file/InfFileCoreService.java | 15 ++---
.../file/impl/InfFileCoreServiceImpl.java | 25 ++++----
.../user/vo/SysUserCoreProfileRespVo.java | 20 ++++++
.../system/enums/SysErrorCodeConstants.java | 3 +
.../user/SysUserProfileController.http | 8 +++
.../user/SysUserProfileController.java | 42 ++++++++++++-
.../member/enums/MbrErrorCodeConstants.java | 5 ++
.../member/service/user/MbrUserService.java | 25 ++++++++
.../service/user/impl/MbrUserServiceImpl.java | 61 +++++++++++++++++++
22 files changed, 218 insertions(+), 72 deletions(-)
delete mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java
rename {yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller => yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra}/file/vo/InfFilePageReqVO.java (94%)
rename {yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller => yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra}/file/vo/InfFileRespVO.java (88%)
rename {yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver => yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice}/modules/infra/framework/file/config/FileConfiguration.java (81%)
rename {yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver => yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice}/modules/infra/framework/file/config/FileProperties.java (88%)
rename {yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver => yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice}/modules/infra/framework/file/package-info.java (92%)
rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java => yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java (69%)
rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java => yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java (66%)
create mode 100644 yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
index 6b2c743ca..2fcbbd00f 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
@@ -2,12 +2,12 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.file;
import cn.hutool.core.io.IoUtil;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
-import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFileRespVO;
+import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFileRespVO;
import cn.iocoder.yudao.adminserver.modules.infra.convert.file.InfFileConvert;
-import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -35,7 +35,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
public class InfFileController {
@Resource
- private InfFileService fileService;
+ private InfFileCoreService fileService;
@PostMapping("/upload")
@ApiOperation("上传文件")
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java
index d39452ffe..78b665292 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.convert.file;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFileRespVO;
+import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFileRespVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java
deleted file mode 100644
index 022f90acb..000000000
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.file;
-
-import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
-import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface InfFileMapper extends BaseMapperX<InfFileDO> {
-
- default Integer selectCountById(String id) {
- return selectCount("id", id);
- }
-
- default PageResult<InfFileDO> selectPage(InfFilePageReqVO reqVO) {
- return selectPage(reqVO, new QueryWrapperX<InfFileDO>()
- .likeIfPresent("id", reqVO.getId())
- .likeIfPresent("type", reqVO.getType())
- .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
- .orderByDesc("create_time"));
- }
-
-}
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/InfErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/InfErrorCodeConstants.java
index b53ff8c1d..98155e723 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/InfErrorCodeConstants.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/InfErrorCodeConstants.java
@@ -27,7 +27,4 @@ public interface InfErrorCodeConstants {
ErrorCode API_ERROR_LOG_NOT_FOUND = new ErrorCode(1001002000, "API 错误日志不存在");
ErrorCode API_ERROR_LOG_PROCESSED = new ErrorCode(1001002001, "API 错误日志已处理");
- // ========== 文件 1001003000 ==========
- ErrorCode FILE_NOT_EXISTS = new ErrorCode(1001003000, "文件不存在");
-
}
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/impl/SysUserServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/impl/SysUserServiceImpl.java
index af7705b63..8901ca022 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/impl/SysUserServiceImpl.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/impl/SysUserServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO;
import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO;
import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*;
@@ -16,6 +15,7 @@ import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;
import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
@@ -59,7 +59,7 @@ public class SysUserServiceImpl implements SysUserService {
@Resource
private PasswordEncoder passwordEncoder;
@Resource
- private InfFileService fileService;
+ private InfFileCoreService fileService;
@Override
public Long createUser(SysUserCreateReqVO reqVO) {
diff --git a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
index 4849d49cd..7c9cafce3 100644
--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
@@ -3,11 +3,11 @@ package cn.iocoder.yudao.adminserver.modules.infra.service.file;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.impl.InfFileCoreServiceImpl;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.adminserver.modules.infra.framework.file.config.FileProperties;
-import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
-import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.file.InfFileMapper;
-import cn.iocoder.yudao.adminserver.modules.infra.service.file.impl.InfFileServiceImpl;
+import cn.iocoder.yudao.coreservice.modules.infra.framework.file.config.FileProperties;
+import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -15,8 +15,8 @@ import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
+import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.FILE_NOT_EXISTS;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
-import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS;
import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
@@ -24,17 +24,17 @@ import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
import static org.junit.jupiter.api.Assertions.*;
-@Import({InfFileServiceImpl.class, FileProperties.class})
+@Import({InfFileCoreServiceImpl.class, FileProperties.class})
public class InfFileServiceTest extends BaseDbUnitTest {
@Resource
- private InfFileServiceImpl fileService;
+ private InfFileCoreServiceImpl fileService;
@MockBean
private FileProperties fileProperties;
@Resource
- private InfFileMapper fileMapper;
+ private InfFileCoreMapper fileMapper;
@Test
public void testCreateFile_success() {
diff --git a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/user/SysUserServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/user/SysUserServiceImplTest.java
index e20e72793..70751eeac 100644
--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/user/SysUserServiceImplTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/user/SysUserServiceImplTest.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.adminserver.modules.system.service.user;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.RandomUtil;
import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
-import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO;
import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO;
import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*;
@@ -14,6 +13,7 @@ import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;
import cn.iocoder.yudao.adminserver.modules.system.service.user.impl.SysUserServiceImpl;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
import cn.iocoder.yudao.coreservice.modules.system.enums.common.SysSexEnum;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
@@ -69,7 +69,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
@MockBean
private PasswordEncoder passwordEncoder;
@MockBean
- private InfFileService fileService;
+ private InfFileCoreService fileService;
@Test
public void testCreatUser_success() {
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
index 180dc2d79..43703c5da 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
@@ -1,10 +1,24 @@
package cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file;
+import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface InfFileCoreMapper extends BaseMapperX<InfFileDO> {
+ default Integer selectCountById(String id) {
+ return selectCount("id", id);
+ }
+
+ default PageResult<InfFileDO> selectPage(InfFilePageReqVO reqVO) {
+ return selectPage(reqVO, new QueryWrapperX<InfFileDO>()
+ .likeIfPresent("id", reqVO.getId())
+ .likeIfPresent("type", reqVO.getType())
+ .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+ .orderByDesc("create_time"));
+ }
}
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFilePageReqVO.java
similarity index 94%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFilePageReqVO.java
index 152466a19..a6124f7ea 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFilePageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo;
+package cn.iocoder.yudao.coreservice.modules.infra.file.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.annotations.ApiModel;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFileRespVO.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFileRespVO.java
similarity index 88%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFileRespVO.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFileRespVO.java
index 2388d7f3d..57dd5b197 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFileRespVO.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFileRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo;
+package cn.iocoder.yudao.coreservice.modules.infra.file.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/config/FileConfiguration.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileConfiguration.java
similarity index 81%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/config/FileConfiguration.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileConfiguration.java
index e71377e3f..a10c7a7af 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/config/FileConfiguration.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileConfiguration.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.adminserver.modules.infra.framework.file.config;
+package cn.iocoder.yudao.coreservice.modules.infra.framework.file.config;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/config/FileProperties.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileProperties.java
similarity index 88%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/config/FileProperties.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileProperties.java
index db1a6b71f..0d8ed7cda 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/config/FileProperties.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileProperties.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.adminserver.modules.infra.framework.file.config;
+package cn.iocoder.yudao.coreservice.modules.infra.framework.file.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/package-info.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/package-info.java
similarity index 92%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/package-info.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/package-info.java
index a69b53eb5..2c2798ee6 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/file/package-info.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/package-info.java
@@ -13,4 +13,4 @@
* 综合考虑，暂时使用方案 3 的方式，比较适合这样一个 all in one 的项目。
* 随着文件的量级大了之后，还是推荐采用云服务。
*/
-package cn.iocoder.yudao.adminserver.modules.infra.framework.file;
+package cn.iocoder.yudao.coreservice.modules.infra.framework.file;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java
similarity index 69%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java
index e19e3ecab..f6f251abe 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java
@@ -1,15 +1,17 @@
-package cn.iocoder.yudao.adminserver.modules.infra.service.file;
+package cn.iocoder.yudao.coreservice.modules.infra.service.file;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
/**
- * 文件 Service 接口
- *
- * @author 芋道源码
+ * @Class:ruoyi-vue-pro.cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService
+ * @Descript: 文件 core Service 接口
+ * @Author:宋天
+ * @Date:2021/10/19
*/
-public interface InfFileService {
+public interface InfFileCoreService {
+
/**
* 保存文件，并返回文件的访问路径
@@ -42,5 +44,4 @@ public interface InfFileService {
* @return 文件分页
*/
PageResult<InfFileDO> getFilePage(InfFilePageReqVO pageReqVO);
-
}
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java
similarity index 66%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java
index 0436b804f..850701ffa 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java
@@ -1,31 +1,32 @@
-package cn.iocoder.yudao.adminserver.modules.infra.service.file.impl;
+package cn.iocoder.yudao.coreservice.modules.infra.service.file.impl;
import cn.hutool.core.io.FileTypeUtil;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
+import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.coreservice.modules.infra.framework.file.config.FileProperties;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.adminserver.modules.infra.framework.file.config.FileProperties;
-import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
-import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.file.InfFileMapper;
-import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
+import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.FILE_NOT_EXISTS;
+import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS;
-import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS;
/**
- * 文件 Service 实现类
- *
- * @author 芋道源码
+ * @Class:ruoyi-vue-pro.cn.iocoder.yudao.coreservice.modules.infra.service.file.impl.InfFileCoreServiceImpl
+ * @Descript: core service 文件实现类
+ * @Author:宋天
+ * @Date:2021/10/19
*/
@Service
-public class InfFileServiceImpl implements InfFileService {
+public class InfFileCoreServiceImpl implements InfFileCoreService {
@Resource
- private InfFileMapper fileMapper;
+ private InfFileCoreMapper fileMapper;
@Resource
private FileProperties fileProperties;
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java
new file mode 100644
index 000000000..50c9a6856
--- /dev/null
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.coreservice.modules.system.controller.user.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("用户个人中心信息 Response VO")
+public class SysUserCoreProfileRespVo {
+
+ @ApiModelProperty(value = "用户昵称", required = true, example = "芋艿")
+ private String nickName;
+
+ @ApiModelProperty(value = "用户头像", required = true, example = "/infra/file/get/35a12e57-4297-4faa-bf7d-7ed2f211c952")
+ private String avatar;
+}
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
index 3c1fc87ef..60249398c 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
@@ -14,4 +14,7 @@ public interface SysErrorCodeConstants {
ErrorCode SMS_SEND_MOBILE_TEMPLATE_PARAM_MISS = new ErrorCode(1006000001, "模板参数({})缺失");
ErrorCode SMS_SEND_TEMPLATE_NOT_EXISTS = new ErrorCode(1006000000, "短信模板不存在");
+ // 文件相关
+ ErrorCode FILE_PATH_EXISTS = new ErrorCode(1006001000, "文件路径已存在");
+ ErrorCode FILE_NOT_EXISTS = new ErrorCode(1006001002, "文件不存在");
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
index 72cf861b8..eb3d8fea6 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
@@ -1,3 +1,11 @@
### 请求 /system/user/profile/get 接口 => 没有权限
GET {{userServerUrl}}/system/user/profile/get
Authorization: Bearer test245
+
+### 请求 /system/user/profile/revise-nickname 接口 成功
+PUT http://localhost:28080/api/system/user/profile/revise-nickname?nickName=yunai111
+Authorization: Bearer test245
+
+### 请求 /system/user/profile/get-user-info 接口 成功
+GET http://localhost:28080/api/system/user/profile/get-user-info?id=245
+Authorization: Bearer test245
\ No newline at end of file
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
index 4b66b4e18..a1e0f5a25 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
@@ -1,14 +1,24 @@
package cn.iocoder.yudao.userserver.modules.member.controller.user;
+import cn.iocoder.yudao.coreservice.modules.system.controller.user.vo.SysUserCoreProfileRespVo;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.userserver.modules.member.service.user.MbrUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
-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 org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+import java.io.IOException;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.userserver.modules.member.enums.MbrErrorCodeConstants.FILE_IS_EMPTY;
@Api(tags = "用户个人中心")
@RestController
@@ -17,6 +27,9 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
public class SysUserProfileController {
+ @Resource
+ private MbrUserService userService;
+
@GetMapping("/get")
@ApiOperation("获得登录用户信息")
@PreAuthenticated
@@ -24,4 +37,27 @@ public class SysUserProfileController {
return null;
}
+ @PutMapping("/revise-nickname")
+ @ApiOperation("修改用户昵称")
+ public CommonResult<Boolean> reviseNickname(@RequestParam("nickName") String nickName) {
+ userService.reviseNickname(getLoginUserId(), nickName);
+ return success(true);
+ }
+
+ @PutMapping("/revise-avatar")
+ @ApiOperation("修改用户头像")
+ public CommonResult<String> reviseAvatar(@RequestParam("avatarFile") MultipartFile file) throws IOException {
+ if (file.isEmpty()) {
+ throw ServiceExceptionUtil.exception(FILE_IS_EMPTY);
+ }
+ String avatar = userService.reviseAvatar(getLoginUserId(), file.getInputStream());
+ return success(avatar);
+ }
+
+ @GetMapping("/get-user-info")
+ @ApiOperation("获取用户头像与昵称")
+ public CommonResult<SysUserCoreProfileRespVo> getUserInfo(@RequestParam("id") Long id) {
+ return success(userService.getUserInfo(id));
+ }
}
+
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
index 265d1d485..5d8507d7f 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
@@ -9,4 +9,9 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
*/
public interface MbrErrorCodeConstants {
+ // 用户相关
+ ErrorCode USER_NOT_EXISTS = new ErrorCode(1004000000, "用户不存在");
+
+ // 文件相关
+ ErrorCode FILE_IS_EMPTY = new ErrorCode(1004000000, "用户不存在");
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
index 2d5466865..bb81d3718 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
@@ -1,8 +1,11 @@
package cn.iocoder.yudao.userserver.modules.member.service.user;
import cn.iocoder.yudao.coreservice.modules.member.dal.dataobject.user.MbrUserDO;
+import cn.iocoder.yudao.coreservice.modules.system.controller.user.vo.SysUserCoreProfileRespVo;
import cn.iocoder.yudao.framework.common.validation.Mobile;
+import java.io.InputStream;
+
/**
* 前台用户 Service 接口
*
@@ -44,4 +47,26 @@ public interface MbrUserService {
*/
MbrUserDO getUser(Long id);
+ /**
+ * 修改用户昵称
+ * @param loginUserId 登录用户id
+ * @param nickName 用户新昵称
+ */
+ void reviseNickname(Long loginUserId, String nickName);
+
+ /**
+ * 修改用户头像
+ * @param loginUserId 登录用户id
+ * @param inputStream 头像文件
+ * @return 头像url
+ */
+ String reviseAvatar(Long loginUserId, InputStream inputStream);
+
+ /**
+ * 根据用户id，获取用户头像与昵称
+ * @param loginUserId 登录用户id
+ * @return 用户响应实体类
+ */
+ SysUserCoreProfileRespVo getUserInfo(Long loginUserId);
+
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
index 71fb9dd88..f10c03ed1 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
@@ -1,18 +1,27 @@
package cn.iocoder.yudao.userserver.modules.member.service.user.impl;
+import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.coreservice.modules.member.dal.dataobject.user.MbrUserDO;
+import cn.iocoder.yudao.coreservice.modules.system.controller.user.vo.SysUserCoreProfileRespVo;
+import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.userserver.modules.member.dal.mysql.user.MbrUserMapper;
import cn.iocoder.yudao.userserver.modules.member.service.user.MbrUserService;
+import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.validation.Valid;
+import java.io.InputStream;
import java.util.Date;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.userserver.modules.member.enums.MbrErrorCodeConstants.USER_NOT_EXISTS;
+
/**
* User Service 实现类
*
@@ -26,6 +35,9 @@ public class MbrUserServiceImpl implements MbrUserService {
@Resource
private MbrUserMapper userMapper;
+ @Resource
+ private InfFileCoreService fileCoreService;
+
@Resource
private PasswordEncoder passwordEncoder;
@@ -68,4 +80,53 @@ public class MbrUserServiceImpl implements MbrUserService {
return userMapper.selectById(id);
}
+ @Override
+ public void reviseNickname(Long loginUserId, String nickName) {
+ MbrUserDO mbrUserDO = userMapper.selectById(loginUserId);
+ // 仅当新昵称不等于旧昵称时进行修改
+ if (!nickName.equals(mbrUserDO.getNickname())){
+ MbrUserDO user = new MbrUserDO();
+ user.setId(mbrUserDO.getId());
+ user.setNickname(nickName);
+ userMapper.updateById(user);
+ }
+ }
+
+ @Override
+ public String reviseAvatar(Long loginUserId, InputStream avatarFile) {
+ this.checkUserExists(loginUserId);
+ // 创建文件
+ String avatar = fileCoreService.createFile(IdUtil.fastUUID(), IoUtil.readBytes(avatarFile));
+ // 更新头像路径
+ MbrUserDO userDO = new MbrUserDO();
+ userDO.setId(loginUserId);
+ userDO.setAvatar(avatar);
+ userMapper.updateById(userDO);
+ return avatar;
+ }
+
+ @Override
+ public SysUserCoreProfileRespVo getUserInfo(Long loginUserId) {
+ MbrUserDO mbrUserDO = userMapper.selectById(loginUserId);
+ if (mbrUserDO == null){
+ log.error("用户不存在:{}",loginUserId);
+ throw exception(USER_NOT_EXISTS);
+ }
+
+ SysUserCoreProfileRespVo userRes = new SysUserCoreProfileRespVo();
+ userRes.setNickName(mbrUserDO.getNickname());
+ userRes.setAvatar(mbrUserDO.getAvatar());
+ return userRes;
+ }
+
+ @VisibleForTesting
+ public void checkUserExists(Long id) {
+ if (id == null) {
+ return;
+ }
+ MbrUserDO user = userMapper.selectById(id);
+ if (user == null) {
+ throw exception(USER_NOT_EXISTS);
+ }
+ }
}
From 79da36ac040910496eeefb9f7720c94238956de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=A4=A9?= <2982176321@qq.com>
Date: Wed, 20 Oct 2021 16:59:47 +0800
Subject: [PATCH 3/6] =?UTF-8?q?[update]=E6=9B=B4=E6=96=B0=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/file/InfFileController.java | 8 +--
.../infra/convert/file/InfFileConvert.java | 2 +-
.../infra/service/file/InfFileService.java | 46 ++++++++++++++++
.../service/file/impl/InfFileServiceImpl.java | 46 ++++++++++++++++
.../service/file/InfFileServiceTest.java | 4 +-
.../file/vo/InfFilePageReqVO.java | 2 +-
.../file/vo/InfFileRespVO.java | 2 +-
.../dal/mysql/file/InfFileCoreMapper.java | 2 +-
.../service/file/InfFileCoreService.java | 17 ++----
.../file/impl/InfFileCoreServiceImpl.java | 17 ++----
.../user/SysUserProfileController.http | 2 +-
.../user/SysUserProfileController.java | 15 +++---
.../controller/user/vo/SysUserInfoRespVO.java | 6 +--
.../member/enums/MbrErrorCodeConstants.java | 8 +--
.../member/service/user/MbrUserService.java | 14 ++---
.../service/user/impl/MbrUserServiceImpl.java | 52 +++++++++----------
16 files changed, 158 insertions(+), 85 deletions(-)
create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
rename yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/{ => controller}/file/vo/InfFilePageReqVO.java (94%)
rename yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/{ => controller}/file/vo/InfFileRespVO.java (88%)
rename yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java => yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/SysUserInfoRespVO.java (75%)
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
index 2fcbbd00f..d0f31429a 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
@@ -1,12 +1,12 @@
package cn.iocoder.yudao.adminserver.modules.infra.controller.file;
import cn.hutool.core.io.IoUtil;
+import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
+import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
-import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
-import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFileRespVO;
import cn.iocoder.yudao.adminserver.modules.infra.convert.file.InfFileConvert;
import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
import io.swagger.annotations.Api;
@@ -35,7 +35,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
public class InfFileController {
@Resource
- private InfFileCoreService fileService;
+ private InfFileService fileService;
@PostMapping("/upload")
@ApiOperation("上传文件")
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java
index 78b665292..aedad94d9 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java
@@ -1,8 +1,8 @@
package cn.iocoder.yudao.adminserver.modules.infra.convert.file;
+import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFileRespVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
new file mode 100644
index 000000000..136175112
--- /dev/null
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.adminserver.modules.infra.service.file;
+
+import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 文件 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface InfFileService {
+
+ /**
+ * 保存文件，并返回文件的访问路径
+ *
+ * @param path 文件路径
+ * @param content 文件内容
+ * @return 文件路径
+ */
+ String createFile(String path, byte[] content);
+
+ /**
+ * 删除文件
+ *
+ * @param id 编号
+ */
+ void deleteFile(String id);
+
+ /**
+ * 获得文件
+ *
+ * @param path 文件路径
+ * @return 文件
+ */
+ InfFileDO getFile(String path);
+
+ /**
+ * 获得文件分页
+ *
+ * @param pageReqVO 分页查询
+ * @return 文件分页
+ */
+ PageResult<InfFileDO> getFilePage(InfFilePageReqVO pageReqVO);
+
+}
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
new file mode 100644
index 000000000..9598d0481
--- /dev/null
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.adminserver.modules.infra.service.file.impl;
+
+import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
+import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 文件 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+public class InfFileServiceImpl implements InfFileService {
+ @Resource
+ private InfFileCoreMapper fileCoreMapper;
+
+ @Resource
+ private InfFileCoreService fileCoreService;
+
+ @Override
+ public String createFile(String path, byte[] content) {
+ return fileCoreService.createFile(path,content);
+ }
+
+ @Override
+ public void deleteFile(String id) {
+ fileCoreService.deleteFile(id);
+ }
+
+ @Override
+ public InfFileDO getFile(String path) {
+ return fileCoreService.getFile(path);
+ }
+
+ @Override
+ public PageResult<InfFileDO> getFilePage(InfFilePageReqVO pageReqVO) {
+ return fileCoreMapper.selectPage(pageReqVO);
+ }
+
+}
diff --git a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
index 7c9cafce3..0b25d4f6e 100644
--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
@@ -2,12 +2,12 @@ package cn.iocoder.yudao.adminserver.modules.infra.service.file;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
+import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
import cn.iocoder.yudao.coreservice.modules.infra.service.file.impl.InfFileCoreServiceImpl;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.coreservice.modules.infra.framework.file.config.FileProperties;
-import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.*;
public class InfFileServiceTest extends BaseDbUnitTest {
@Resource
- private InfFileCoreServiceImpl fileService;
+ private InfFileService fileService;
@MockBean
private FileProperties fileProperties;
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFilePageReqVO.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFilePageReqVO.java
similarity index 94%
rename from yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFilePageReqVO.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFilePageReqVO.java
index a6124f7ea..8e43b6642 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFilePageReqVO.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFilePageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.coreservice.modules.infra.file.vo;
+package cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.annotations.ApiModel;
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFileRespVO.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFileRespVO.java
similarity index 88%
rename from yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFileRespVO.java
rename to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFileRespVO.java
index 57dd5b197..e264a3fd2 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/file/vo/InfFileRespVO.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFileRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.coreservice.modules.infra.file.vo;
+package cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
index 43703c5da..775d81eba 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
@@ -1,6 +1,6 @@
package cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file;
-import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java
index f6f251abe..a594bcef4 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java
@@ -1,14 +1,11 @@
package cn.iocoder.yudao.coreservice.modules.infra.service.file;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
-import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
/**
- * @Class:ruoyi-vue-pro.cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService
- * @Descript: 文件 core Service 接口
- * @Author:宋天
- * @Date:2021/10/19
+ * core service 文件接口
+ *
+ * @author 宋天
*/
public interface InfFileCoreService {
@@ -36,12 +33,4 @@ public interface InfFileCoreService {
* @return 文件
*/
InfFileDO getFile(String path);
-
- /**
- * 获得文件分页
- *
- * @param pageReqVO 分页查询
- * @return 文件分页
- */
- PageResult<InfFileDO> getFilePage(InfFilePageReqVO pageReqVO);
}
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java
index 850701ffa..2f0fb2865 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java
@@ -3,24 +3,20 @@ package cn.iocoder.yudao.coreservice.modules.infra.service.file.impl;
import cn.hutool.core.io.FileTypeUtil;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
-import cn.iocoder.yudao.coreservice.modules.infra.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.coreservice.modules.infra.framework.file.config.FileProperties;
import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
-import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.FILE_NOT_EXISTS;
-import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS;
+import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
/**
- * @Class:ruoyi-vue-pro.cn.iocoder.yudao.coreservice.modules.infra.service.file.impl.InfFileCoreServiceImpl
- * @Descript: core service 文件实现类
- * @Author:宋天
- * @Date:2021/10/19
+ * core service 文件实现类
+ *
+ * @author 宋天
*/
@Service
public class InfFileCoreServiceImpl implements InfFileCoreService {
@@ -65,9 +61,4 @@ public class InfFileCoreServiceImpl implements InfFileCoreService {
return fileMapper.selectById(path);
}
- @Override
- public PageResult<InfFileDO> getFilePage(InfFilePageReqVO pageReqVO) {
- return fileMapper.selectPage(pageReqVO);
- }
-
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
index eb3d8fea6..d8fd6f8dd 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
@@ -3,7 +3,7 @@ GET {{userServerUrl}}/system/user/profile/get
Authorization: Bearer test245
### 请求 /system/user/profile/revise-nickname 接口 成功
-PUT http://localhost:28080/api/system/user/profile/revise-nickname?nickName=yunai111
+PUT http://localhost:28080/api/system/user/profile/update-nickname?nickName=yunai222
Authorization: Bearer test245
### 请求 /system/user/profile/get-user-info 接口 成功
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
index a1e0f5a25..9619f405f 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
@@ -1,6 +1,6 @@
package cn.iocoder.yudao.userserver.modules.member.controller.user;
-import cn.iocoder.yudao.coreservice.modules.system.controller.user.vo.SysUserCoreProfileRespVo;
+import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.SysUserInfoRespVO;
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
@@ -37,15 +37,17 @@ public class SysUserProfileController {
return null;
}
- @PutMapping("/revise-nickname")
+ @PutMapping("/update-nickname")
@ApiOperation("修改用户昵称")
- public CommonResult<Boolean> reviseNickname(@RequestParam("nickName") String nickName) {
- userService.reviseNickname(getLoginUserId(), nickName);
+ @PreAuthenticated
+ public CommonResult<Boolean> updateNickname(@RequestParam("nickName") String nickName) {
+ userService.updateNickname(getLoginUserId(), nickName);
return success(true);
}
@PutMapping("/revise-avatar")
@ApiOperation("修改用户头像")
+ @PreAuthenticated
public CommonResult<String> reviseAvatar(@RequestParam("avatarFile") MultipartFile file) throws IOException {
if (file.isEmpty()) {
throw ServiceExceptionUtil.exception(FILE_IS_EMPTY);
@@ -56,8 +58,9 @@ public class SysUserProfileController {
@GetMapping("/get-user-info")
@ApiOperation("获取用户头像与昵称")
- public CommonResult<SysUserCoreProfileRespVo> getUserInfo(@RequestParam("id") Long id) {
- return success(userService.getUserInfo(id));
+ @PreAuthenticated
+ public CommonResult<SysUserInfoRespVO> getUserInfo() {
+ return success(userService.getUserInfo(getLoginUserId()));
}
}
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/SysUserInfoRespVO.java
similarity index 75%
rename from yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java
rename to yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/SysUserInfoRespVO.java
index 50c9a6856..0468960bd 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/controller/user/vo/SysUserCoreProfileRespVo.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/SysUserInfoRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.coreservice.modules.system.controller.user.vo;
+package cn.iocoder.yudao.userserver.modules.member.controller.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -6,11 +6,11 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+@ApiModel("用户个人信息 Response VO")
@Data
@NoArgsConstructor
@AllArgsConstructor
-@ApiModel("用户个人中心信息 Response VO")
-public class SysUserCoreProfileRespVo {
+public class SysUserInfoRespVO {
@ApiModelProperty(value = "用户昵称", required = true, example = "芋艿")
private String nickName;
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
index 5d8507d7f..058918b3e 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
@@ -9,9 +9,9 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
*/
public interface MbrErrorCodeConstants {
- // 用户相关
- ErrorCode USER_NOT_EXISTS = new ErrorCode(1004000000, "用户不存在");
+ // ==========用户相关============
+ ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "用户不存在");
- // 文件相关
- ErrorCode FILE_IS_EMPTY = new ErrorCode(1004000000, "用户不存在");
+ // ==========文件相关 ===========
+ ErrorCode FILE_IS_EMPTY = new ErrorCode(1004002000, "文件不存在");
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
index bb81d3718..32073540b 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
@@ -1,7 +1,7 @@
package cn.iocoder.yudao.userserver.modules.member.service.user;
import cn.iocoder.yudao.coreservice.modules.member.dal.dataobject.user.MbrUserDO;
-import cn.iocoder.yudao.coreservice.modules.system.controller.user.vo.SysUserCoreProfileRespVo;
+import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.SysUserInfoRespVO;
import cn.iocoder.yudao.framework.common.validation.Mobile;
import java.io.InputStream;
@@ -49,24 +49,24 @@ public interface MbrUserService {
/**
* 修改用户昵称
- * @param loginUserId 登录用户id
+ * @param userId 用户id
* @param nickName 用户新昵称
*/
- void reviseNickname(Long loginUserId, String nickName);
+ void updateNickname(Long userId, String nickName);
/**
* 修改用户头像
- * @param loginUserId 登录用户id
+ * @param userId 用户id
* @param inputStream 头像文件
* @return 头像url
*/
- String reviseAvatar(Long loginUserId, InputStream inputStream);
+ String reviseAvatar(Long userId, InputStream inputStream);
/**
* 根据用户id，获取用户头像与昵称
- * @param loginUserId 登录用户id
+ * @param userId 用户id
* @return 用户响应实体类
*/
- SysUserCoreProfileRespVo getUserInfo(Long loginUserId);
+ SysUserInfoRespVO getUserInfo(Long userId);
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
index f10c03ed1..3f2531067 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
@@ -4,8 +4,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.coreservice.modules.member.dal.dataobject.user.MbrUserDO;
-import cn.iocoder.yudao.coreservice.modules.system.controller.user.vo.SysUserCoreProfileRespVo;
-import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
+import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.SysUserInfoRespVO;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.userserver.modules.member.dal.mysql.user.MbrUserMapper;
import cn.iocoder.yudao.userserver.modules.member.service.user.MbrUserService;
@@ -81,52 +80,51 @@ public class MbrUserServiceImpl implements MbrUserService {
}
@Override
- public void reviseNickname(Long loginUserId, String nickName) {
- MbrUserDO mbrUserDO = userMapper.selectById(loginUserId);
+ public void updateNickname(Long userId, String nickName) {
+ MbrUserDO user = this.checkUserExists(userId);
// 仅当新昵称不等于旧昵称时进行修改
- if (!nickName.equals(mbrUserDO.getNickname())){
- MbrUserDO user = new MbrUserDO();
- user.setId(mbrUserDO.getId());
- user.setNickname(nickName);
- userMapper.updateById(user);
+ if (nickName.equals(user.getNickname())){
+ return;
}
+ MbrUserDO userDO = new MbrUserDO();
+ userDO.setId(user.getId());
+ userDO.setNickname(nickName);
+ userMapper.updateById(userDO);
}
@Override
- public String reviseAvatar(Long loginUserId, InputStream avatarFile) {
- this.checkUserExists(loginUserId);
+ public String reviseAvatar(Long userId, InputStream avatarFile) {
+ this.checkUserExists(userId);
// 创建文件
String avatar = fileCoreService.createFile(IdUtil.fastUUID(), IoUtil.readBytes(avatarFile));
// 更新头像路径
- MbrUserDO userDO = new MbrUserDO();
- userDO.setId(loginUserId);
- userDO.setAvatar(avatar);
+ MbrUserDO userDO = MbrUserDO.builder()
+ .id(userId)
+ .avatar(avatar)
+ .build();
userMapper.updateById(userDO);
return avatar;
}
@Override
- public SysUserCoreProfileRespVo getUserInfo(Long loginUserId) {
- MbrUserDO mbrUserDO = userMapper.selectById(loginUserId);
- if (mbrUserDO == null){
- log.error("用户不存在:{}",loginUserId);
- throw exception(USER_NOT_EXISTS);
- }
-
- SysUserCoreProfileRespVo userRes = new SysUserCoreProfileRespVo();
- userRes.setNickName(mbrUserDO.getNickname());
- userRes.setAvatar(mbrUserDO.getAvatar());
- return userRes;
+ public SysUserInfoRespVO getUserInfo(Long userId) {
+ MbrUserDO user = this.checkUserExists(userId);
+ SysUserInfoRespVO userResp = new SysUserInfoRespVO();
+ userResp.setNickName(user.getNickname());
+ userResp.setAvatar(user.getAvatar());
+ return userResp;
}
@VisibleForTesting
- public void checkUserExists(Long id) {
+ public MbrUserDO checkUserExists(Long id) {
if (id == null) {
- return;
+ return null;
}
MbrUserDO user = userMapper.selectById(id);
if (user == null) {
throw exception(USER_NOT_EXISTS);
+ }else{
+ return user;
}
}
}
From 5193de7c568a5da09561311f229192208e600e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=A4=A9?= <2982176321@qq.com>
Date: Wed, 20 Oct 2021 18:51:51 +0800
Subject: [PATCH 4/6] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../userserver/modules/member/enums/MbrErrorCodeConstants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
index 058918b3e..d6a3c11b2 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
@@ -13,5 +13,5 @@ public interface MbrErrorCodeConstants {
ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "用户不存在");
// ==========文件相关 ===========
- ErrorCode FILE_IS_EMPTY = new ErrorCode(1004002000, "文件不存在");
+ ErrorCode FILE_IS_EMPTY = new ErrorCode(1004002000, "文件为空");
}
From f4a5a139b5719dbcde750fbb2f97de15bbda10cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=A4=A9?= <2982176321@qq.com>
Date: Sun, 24 Oct 2021 22:33:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?[update]user=20server=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E8=A7=84=E8=8C=83=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/file/InfFileController.java | 2 +-
.../controller/file/vo/InfFilePageReqVO.java | 2 +-
.../infra/dal/mysql/file/InfFileMapper.java | 24 ++++
.../infra/service/file/InfFileService.java | 2 +-
.../service/file/impl/InfFileServiceImpl.java | 9 +-
.../service/file/InfFileServiceTest.java | 2 +-
.../dal/mysql/file/InfFileCoreMapper.java | 12 --
.../system/enums/SysErrorCodeConstants.java | 2 +-
.../user/SysUserProfileController.http | 4 +-
.../user/SysUserProfileController.java | 17 +--
...InfoRespVO.java => MbrUserInfoRespVO.java} | 2 +-
.../member/enums/MbrErrorCodeConstants.java | 4 +-
.../member/service/user/MbrUserService.java | 6 +-
.../service/user/impl/MbrUserServiceImpl.java | 8 +-
.../yudao/userserver/BaseDbUnitTest.java | 39 +++++++
.../service/MbrUserServiceImplTest.java | 107 ++++++++++++++++++
.../test/resources/application-unit-test.yaml | 44 +++++++
.../src/test/resources/file/erweima.jpg | Bin 0 -> 18385 bytes
.../src/test/resources/logback-spring.xml | 4 +
.../src/test/resources/sql/clean.sql | 2 +
.../src/test/resources/sql/create_tables.sql | 32 ++++++
21 files changed, 279 insertions(+), 45 deletions(-)
rename {yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice => yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver}/modules/infra/controller/file/vo/InfFilePageReqVO.java (94%)
create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java
rename yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/{SysUserInfoRespVO.java => MbrUserInfoRespVO.java} (94%)
create mode 100644 yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/BaseDbUnitTest.java
create mode 100644 yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/modules/member/service/MbrUserServiceImplTest.java
create mode 100644 yudao-user-server/src/test/resources/application-unit-test.yaml
create mode 100644 yudao-user-server/src/test/resources/file/erweima.jpg
create mode 100644 yudao-user-server/src/test/resources/logback-spring.xml
create mode 100644 yudao-user-server/src/test/resources/sql/clean.sql
create mode 100644 yudao-user-server/src/test/resources/sql/create_tables.sql
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
index d0f31429a..b2a49d6e1 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.file;
import cn.hutool.core.io.IoUtil;
import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
-import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFilePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java
similarity index 94%
rename from yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFilePageReqVO.java
rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java
index 8e43b6642..152466a19 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFilePageReqVO.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.annotations.ApiModel;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java
new file mode 100644
index 000000000..d3dfcccbb
--- /dev/null
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.file;
+
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * admin 文件操作 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfFileMapper extends BaseMapperX<InfFileDO> {
+ default PageResult<InfFileDO> selectPage(InfFilePageReqVO reqVO) {
+ return selectPage(reqVO, new QueryWrapperX<InfFileDO>()
+ .likeIfPresent("id", reqVO.getId())
+ .likeIfPresent("type", reqVO.getType())
+ .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+ .orderByDesc("create_time"));
+ }
+}
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
index 136175112..a98fd16a7 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
@@ -1,6 +1,6 @@
package cn.iocoder.yudao.adminserver.modules.infra.service.file;
-import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
index 9598d0481..69b4cf0db 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
@@ -1,9 +1,9 @@
package cn.iocoder.yudao.adminserver.modules.infra.service.file.impl;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.file.InfFileMapper;
import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
-import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
-import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import org.springframework.stereotype.Service;
@@ -17,8 +17,9 @@ import javax.annotation.Resource;
*/
@Service
public class InfFileServiceImpl implements InfFileService {
+
@Resource
- private InfFileCoreMapper fileCoreMapper;
+ private InfFileMapper fileMapper;
@Resource
private InfFileCoreService fileCoreService;
@@ -40,7 +41,7 @@ public class InfFileServiceImpl implements InfFileService {
@Override
public PageResult<InfFileDO> getFilePage(InfFilePageReqVO pageReqVO) {
- return fileCoreMapper.selectPage(pageReqVO);
+ return fileMapper.selectPage(pageReqVO);
}
}
diff --git a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
index 0b25d4f6e..ca92bc7d9 100644
--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.service.file;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
-import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
import cn.iocoder.yudao.coreservice.modules.infra.service.file.impl.InfFileCoreServiceImpl;
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
index 775d81eba..88266caae 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java
@@ -1,10 +1,7 @@
package cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file;
-import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFilePageReqVO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
import org.apache.ibatis.annotations.Mapper;
@Mapper
@@ -12,13 +9,4 @@ public interface InfFileCoreMapper extends BaseMapperX<InfFileDO> {
default Integer selectCountById(String id) {
return selectCount("id", id);
}
-
- default PageResult<InfFileDO> selectPage(InfFilePageReqVO reqVO) {
- return selectPage(reqVO, new QueryWrapperX<InfFileDO>()
- .likeIfPresent("id", reqVO.getId())
- .likeIfPresent("type", reqVO.getType())
- .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
- .orderByDesc("create_time"));
- }
-
}
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
index 60249398c..09a3e7204 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
@@ -14,7 +14,7 @@ public interface SysErrorCodeConstants {
ErrorCode SMS_SEND_MOBILE_TEMPLATE_PARAM_MISS = new ErrorCode(1006000001, "模板参数({})缺失");
ErrorCode SMS_SEND_TEMPLATE_NOT_EXISTS = new ErrorCode(1006000000, "短信模板不存在");
- // 文件相关
+ // ========= 文件相关 1006001000=================
ErrorCode FILE_PATH_EXISTS = new ErrorCode(1006001000, "文件路径已存在");
ErrorCode FILE_NOT_EXISTS = new ErrorCode(1006001002, "文件不存在");
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
index d8fd6f8dd..1ce9eea62 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.http
@@ -3,9 +3,9 @@ GET {{userServerUrl}}/system/user/profile/get
Authorization: Bearer test245
### 请求 /system/user/profile/revise-nickname 接口 成功
-PUT http://localhost:28080/api/system/user/profile/update-nickname?nickName=yunai222
+PUT {{userServerUrl}}/system/user/profile/update-nickname?nickName=yunai222
Authorization: Bearer test245
### 请求 /system/user/profile/get-user-info 接口 成功
-GET http://localhost:28080/api/system/user/profile/get-user-info?id=245
+GET {{userServerUrl}}/system/user/profile/get-user-info?id=245
Authorization: Bearer test245
\ No newline at end of file
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
index 9619f405f..11c5f706a 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
@@ -1,6 +1,6 @@
package cn.iocoder.yudao.userserver.modules.member.controller.user;
-import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.SysUserInfoRespVO;
+import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.MbrUserInfoRespVO;
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
@@ -30,13 +30,6 @@ public class SysUserProfileController {
@Resource
private MbrUserService userService;
- @GetMapping("/get")
- @ApiOperation("获得登录用户信息")
- @PreAuthenticated
- public CommonResult<Boolean> profile() {
- return null;
- }
-
@PutMapping("/update-nickname")
@ApiOperation("修改用户昵称")
@PreAuthenticated
@@ -45,21 +38,21 @@ public class SysUserProfileController {
return success(true);
}
- @PutMapping("/revise-avatar")
+ @PutMapping("/update-avatar")
@ApiOperation("修改用户头像")
@PreAuthenticated
- public CommonResult<String> reviseAvatar(@RequestParam("avatarFile") MultipartFile file) throws IOException {
+ public CommonResult<String> updateAvatar(@RequestParam("avatarFile") MultipartFile file) throws IOException {
if (file.isEmpty()) {
throw ServiceExceptionUtil.exception(FILE_IS_EMPTY);
}
- String avatar = userService.reviseAvatar(getLoginUserId(), file.getInputStream());
+ String avatar = userService.updateAvatar(getLoginUserId(), file.getInputStream());
return success(avatar);
}
@GetMapping("/get-user-info")
@ApiOperation("获取用户头像与昵称")
@PreAuthenticated
- public CommonResult<SysUserInfoRespVO> getUserInfo() {
+ public CommonResult<MbrUserInfoRespVO> getUserInfo() {
return success(userService.getUserInfo(getLoginUserId()));
}
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/SysUserInfoRespVO.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/MbrUserInfoRespVO.java
similarity index 94%
rename from yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/SysUserInfoRespVO.java
rename to yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/MbrUserInfoRespVO.java
index 0468960bd..e46bd410f 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/SysUserInfoRespVO.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/vo/MbrUserInfoRespVO.java
@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class SysUserInfoRespVO {
+public class MbrUserInfoRespVO {
@ApiModelProperty(value = "用户昵称", required = true, example = "芋艿")
private String nickName;
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
index d6a3c11b2..3794eb09d 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/enums/MbrErrorCodeConstants.java
@@ -9,9 +9,9 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
*/
public interface MbrErrorCodeConstants {
- // ==========用户相关============
+ // ==========用户相关 1004001000============
ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "用户不存在");
- // ==========文件相关 ===========
+ // ==========文件相关 1004002000 ===========
ErrorCode FILE_IS_EMPTY = new ErrorCode(1004002000, "文件为空");
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
index 32073540b..6b6a36a8e 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/MbrUserService.java
@@ -1,7 +1,7 @@
package cn.iocoder.yudao.userserver.modules.member.service.user;
import cn.iocoder.yudao.coreservice.modules.member.dal.dataobject.user.MbrUserDO;
-import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.SysUserInfoRespVO;
+import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.MbrUserInfoRespVO;
import cn.iocoder.yudao.framework.common.validation.Mobile;
import java.io.InputStream;
@@ -60,13 +60,13 @@ public interface MbrUserService {
* @param inputStream 头像文件
* @return 头像url
*/
- String reviseAvatar(Long userId, InputStream inputStream);
+ String updateAvatar(Long userId, InputStream inputStream);
/**
* 根据用户id，获取用户头像与昵称
* @param userId 用户id
* @return 用户响应实体类
*/
- SysUserInfoRespVO getUserInfo(Long userId);
+ MbrUserInfoRespVO getUserInfo(Long userId);
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
index 3f2531067..5bff9d6cb 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
@@ -4,7 +4,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.coreservice.modules.member.dal.dataobject.user.MbrUserDO;
-import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.SysUserInfoRespVO;
+import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.MbrUserInfoRespVO;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.userserver.modules.member.dal.mysql.user.MbrUserMapper;
import cn.iocoder.yudao.userserver.modules.member.service.user.MbrUserService;
@@ -93,7 +93,7 @@ public class MbrUserServiceImpl implements MbrUserService {
}
@Override
- public String reviseAvatar(Long userId, InputStream avatarFile) {
+ public String updateAvatar(Long userId, InputStream avatarFile) {
this.checkUserExists(userId);
// 创建文件
String avatar = fileCoreService.createFile(IdUtil.fastUUID(), IoUtil.readBytes(avatarFile));
@@ -107,9 +107,9 @@ public class MbrUserServiceImpl implements MbrUserService {
}
@Override
- public SysUserInfoRespVO getUserInfo(Long userId) {
+ public MbrUserInfoRespVO getUserInfo(Long userId) {
MbrUserDO user = this.checkUserExists(userId);
- SysUserInfoRespVO userResp = new SysUserInfoRespVO();
+ MbrUserInfoRespVO userResp = new MbrUserInfoRespVO();
userResp.setNickName(user.getNickname());
userResp.setAvatar(user.getAvatar());
return userResp;
diff --git a/yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/BaseDbUnitTest.java b/yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/BaseDbUnitTest.java
new file mode 100644
index 000000000..af8d71a0c
--- /dev/null
+++ b/yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/BaseDbUnitTest.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.userserver;
+
+import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
+import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.jdbc.Sql;
+
+/**
+ * 依赖内存 DB 的单元测试
+ *
+ * 注意，Service 层同样适用。对于 Service 层的单元测试，我们针对自己模块的 Mapper 走的是 H2 内存数据库，针对别的模块的 Service 走的是 Mock 方法
+ *
+ * @author 芋道源码
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = BaseDbUnitTest.Application.class)
+@ActiveProfiles("unit-test") // 设置使用 application-unit-test 配置文件
+@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) // 每个单元测试结束后，清理 DB
+public class BaseDbUnitTest {
+
+ @Import({
+ // DB 配置类
+ YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类
+ DataSourceAutoConfiguration.class, // Spring DB 自动配置类
+ DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类
+ DruidDataSourceAutoConfigure.class, // Druid 自动配置类
+ // MyBatis 配置类
+ YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类
+ MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类
+ })
+ public static class Application {
+ }
+
+}
diff --git a/yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/modules/member/service/MbrUserServiceImplTest.java b/yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/modules/member/service/MbrUserServiceImplTest.java
new file mode 100644
index 000000000..3639c25db
--- /dev/null
+++ b/yudao-user-server/src/test/java/cn/iocoder/yudao/userserver/modules/member/service/MbrUserServiceImplTest.java
@@ -0,0 +1,107 @@
+package cn.iocoder.yudao.userserver.modules.member.service;
+
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
+import cn.iocoder.yudao.coreservice.modules.member.dal.dataobject.user.MbrUserDO;
+import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
+import cn.iocoder.yudao.userserver.BaseDbUnitTest;
+import cn.iocoder.yudao.userserver.modules.member.controller.user.vo.MbrUserInfoRespVO;
+import cn.iocoder.yudao.userserver.modules.member.dal.mysql.user.MbrUserMapper;
+import cn.iocoder.yudao.userserver.modules.member.service.user.impl.MbrUserServiceImpl;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.io.*;
+import java.util.function.Consumer;
+
+import static cn.hutool.core.util.RandomUtil.randomBytes;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
+import static org.mockito.Mockito.*;
+/**
+ * {@link MbrUserServiceImpl} 的单元测试类
+ *
+ * @author 宋天
+ */
+@Import(MbrUserServiceImpl.class)
+public class MbrUserServiceImplTest extends BaseDbUnitTest {
+
+ @Resource
+ private MbrUserServiceImpl mbrUserService;
+
+ @Resource
+ private MbrUserMapper userMapper;
+
+ @MockBean
+ private InfFileCoreService fileCoreService;
+
+ @MockBean
+ private PasswordEncoder passwordEncoder;
+
+ @Test
+ public void testUpdateNickName_success(){
+ // mock 数据
+ MbrUserDO userDO = randomMbrUserDO();
+ userMapper.insert(userDO);
+
+ // 随机昵称
+ String newNickName = randomString();
+
+ // 调用接口修改昵称
+ mbrUserService.updateNickname(userDO.getId(),newNickName);
+ // 查询新修改后的昵称
+ String nickname = mbrUserService.getUser(userDO.getId()).getNickname();
+ // 断言
+ assertEquals(newNickName,nickname);
+ }
+
+ @Test
+ public void testGetUserInfo_success(){
+ // mock 数据
+ MbrUserDO userDO = randomMbrUserDO();
+ userMapper.insert(userDO);
+
+ // 查询用户昵称与头像
+ MbrUserInfoRespVO userInfo = mbrUserService.getUserInfo(userDO.getId());
+ System.out.println(userInfo);
+ }
+
+ @Test
+ public void testUpdateAvatar_success(){
+ // mock 数据
+ MbrUserDO dbUser = randomMbrUserDO();
+ userMapper.insert(dbUser);
+
+ // 准备参数
+ Long userId = dbUser.getId();
+ byte[] avatarFileBytes = randomBytes(10);
+ ByteArrayInputStream avatarFile = new ByteArrayInputStream(avatarFileBytes);
+ // mock 方法
+ String avatar = randomString();
+ when(fileCoreService.createFile(anyString(), eq(avatarFileBytes))).thenReturn(avatar);
+ // 调用
+ String str = mbrUserService.updateAvatar(userId, avatarFile);
+ // 断言
+ assertEquals(avatar, str);
+ }
+
+ // ========== 随机对象 ==========
+
+ @SafeVarargs
+ private static MbrUserDO randomMbrUserDO(Consumer<MbrUserDO>... consumers) {
+ Consumer<MbrUserDO> consumer = (o) -> {
+ o.setStatus(randomEle(CommonStatusEnum.values()).getStatus()); // 保证 status 的范围
+ };
+ return randomPojo(MbrUserDO.class, ArrayUtils.append(consumer, consumers));
+ }
+
+}
diff --git a/yudao-user-server/src/test/resources/application-unit-test.yaml b/yudao-user-server/src/test/resources/application-unit-test.yaml
new file mode 100644
index 000000000..d306a7af4
--- /dev/null
+++ b/yudao-user-server/src/test/resources/application-unit-test.yaml
@@ -0,0 +1,44 @@
+spring:
+ main:
+ lazy-initialization: true # 开启懒加载，加快速度
+ banner-mode: off # 单元测试，禁用 Banner
+
+--- #################### 数据库相关配置 ####################
+
+spring:
+ # 数据源配置项
+ datasource:
+ name: ruoyi-vue-pro
+ url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写
+ driver-class-name: org.h2.Driver
+ username: sa
+ password:
+ schema: classpath:sql/create_tables.sql # MySQL 转 H2 的语句，使用 https://www.jooq.org/translate/ 工具
+ druid:
+ async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度
+ initial-size: 1 # 单元测试，配置为 1，提升启动速度
+
+ # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
+ redis:
+ host: 127.0.0.1 # 地址
+ port: 16379 # 端口（单元测试，使用 16379 端口）
+ database: 0 # 数据库索引
+
+mybatis:
+ lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试
+
+--- #################### 定时任务相关配置 ####################
+
+--- #################### 配置中心相关配置 ####################
+
+--- #################### 服务保障相关配置 ####################
+
+# Lock4j 配置项（单元测试，禁用 Lock4j）
+
+# Resilience4j 配置项
+
+--- #################### 监控相关配置 ####################
+
+--- #################### 芋道相关配置 ####################
+
+# 芋道配置项，设置当前项目所有自定义的配置
diff --git a/yudao-user-server/src/test/resources/file/erweima.jpg b/yudao-user-server/src/test/resources/file/erweima.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1447283cdf1b49b51c1204a160e01cb789e957a8
GIT binary patch
literal 18385
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
literal 0
HcmV?d00001
diff --git a/yudao-user-server/src/test/resources/logback-spring.xml b/yudao-user-server/src/test/resources/logback-spring.xml
new file mode 100644
index 000000000..daf756bff
--- /dev/null
+++ b/yudao-user-server/src/test/resources/logback-spring.xml
@@ -0,0 +1,4 @@
+<configuration>
+ <!-- 引用 Spring Boot 的 logback 基础配置 -->
+ <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+</configuration>
diff --git a/yudao-user-server/src/test/resources/sql/clean.sql b/yudao-user-server/src/test/resources/sql/clean.sql
new file mode 100644
index 000000000..bedf8d008
--- /dev/null
+++ b/yudao-user-server/src/test/resources/sql/clean.sql
@@ -0,0 +1,2 @@
+-- mbr 开头的 DB
+DELETE FROM "mbr_user";
\ No newline at end of file
diff --git a/yudao-user-server/src/test/resources/sql/create_tables.sql b/yudao-user-server/src/test/resources/sql/create_tables.sql
new file mode 100644
index 000000000..306900101
--- /dev/null
+++ b/yudao-user-server/src/test/resources/sql/create_tables.sql
@@ -0,0 +1,32 @@
+-- mbr 开头的 DB
+CREATE TABLE IF NOT EXISTS "mbr_user" (
+ "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
+ "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称',
+ "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像',
+ "status" tinyint NOT NULL COMMENT '状态',
+ "mobile" varchar(11) NOT NULL COMMENT '手机号',
+ "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码',
+ "register_ip" varchar(32) NOT NULL COMMENT '注册 IP',
+ "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP',
+ "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间',
+ "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者',
+ "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者',
+ "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+ PRIMARY KEY ("id")
+) COMMENT '会员表';
+
+-- inf 开头的 DB
+CREATE TABLE IF NOT EXISTS "inf_file" (
+ "id" varchar(188) NOT NULL,
+ "type" varchar(63) DEFAULT NULL,
+ "content" blob NOT NULL,
+ "creator" varchar(64) DEFAULT '',
+ "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "updater" varchar(64) DEFAULT '',
+ "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "deleted" bit NOT NULL DEFAULT FALSE,
+ PRIMARY KEY ("id")
+) COMMENT '文件表';
+
From 65843d55a07693e7651934bf740c6bce0aabfde8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 27 Oct 2021 10:17:42 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=8F=B7=E4=B8=BA=201.2.0-snapshot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
.../controller/file/InfFileController.java | 9 ++++---
.../infra/service/file/InfFileService.java | 24 -------------------
.../service/file/impl/InfFileServiceImpl.java | 18 --------------
.../system/enums/SysErrorCodeConstants.java | 1 -
yudao-core-service/pom.xml | 2 +-
yudao-dependencies/pom.xml | 2 +-
.../user/SysUserProfileController.java | 1 +
.../service/user/impl/MbrUserServiceImpl.java | 1 +
更新日志.md | 10 +++++---
10 files changed, 18 insertions(+), 52 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1ca158c9f..b6290c1d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
- <revision>1.1.0-snapshot</revision>
+ <revision>1.2.0-snapshot</revision>
<!-- Maven 相关 -->
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
index b2a49d6e1..ede2a68bb 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO;
import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.adminserver.modules.infra.convert.file.InfFileConvert;
@@ -36,6 +37,8 @@ public class InfFileController {
@Resource
private InfFileService fileService;
+ @Resource
+ private InfFileCoreService fileCoreService;
@PostMapping("/upload")
@ApiOperation("上传文件")
@@ -45,7 +48,7 @@ public class InfFileController {
})
public CommonResult<String> uploadFile(@RequestParam("file") MultipartFile file,
@RequestParam("path") String path) throws IOException {
- return success(fileService.createFile(path, IoUtil.readBytes(file.getInputStream())));
+ return success(fileCoreService.createFile(path, IoUtil.readBytes(file.getInputStream())));
}
@DeleteMapping("/delete")
@@ -53,7 +56,7 @@ public class InfFileController {
@ApiImplicitParam(name = "id", value = "编号", required = true)
@PreAuthorize("@ss.hasPermission('infra:file:delete')")
public CommonResult<Boolean> deleteFile(@RequestParam("id") String id) {
- fileService.deleteFile(id);
+ fileCoreService.deleteFile(id);
return success(true);
}
@@ -61,7 +64,7 @@ public class InfFileController {
@ApiOperation("下载文件")
@ApiImplicitParam(name = "path", value = "文件附件", required = true, dataTypeClass = MultipartFile.class)
public void getFile(HttpServletResponse response, @PathVariable("path") String path) throws IOException {
- InfFileDO file = fileService.getFile(path);
+ InfFileDO file = fileCoreService.getFile(path);
if (file == null) {
log.warn("[getFile][path({}) 文件不存在]", path);
response.setStatus(HttpStatus.NOT_FOUND.value());
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
index a98fd16a7..1c8311b29 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java
@@ -11,30 +11,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
*/
public interface InfFileService {
- /**
- * 保存文件，并返回文件的访问路径
- *
- * @param path 文件路径
- * @param content 文件内容
- * @return 文件路径
- */
- String createFile(String path, byte[] content);
-
- /**
- * 删除文件
- *
- * @param id 编号
- */
- void deleteFile(String id);
-
- /**
- * 获得文件
- *
- * @param path 文件路径
- * @return 文件
- */
- InfFileDO getFile(String path);
-
/**
* 获得文件分页
*
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
index 69b4cf0db..b8967c638 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java
@@ -21,24 +21,6 @@ public class InfFileServiceImpl implements InfFileService {
@Resource
private InfFileMapper fileMapper;
- @Resource
- private InfFileCoreService fileCoreService;
-
- @Override
- public String createFile(String path, byte[] content) {
- return fileCoreService.createFile(path,content);
- }
-
- @Override
- public void deleteFile(String id) {
- fileCoreService.deleteFile(id);
- }
-
- @Override
- public InfFileDO getFile(String path) {
- return fileCoreService.getFile(path);
- }
-
@Override
public PageResult<InfFileDO> getFilePage(InfFilePageReqVO pageReqVO) {
return fileMapper.selectPage(pageReqVO);
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysErrorCodeConstants.java
index 8a606e062..0fad26be8 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysErrorCodeConstants.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysErrorCodeConstants.java
@@ -1,7 +1,6 @@
package cn.iocoder.yudao.adminserver.modules.system.enums;
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import javafx.beans.binding.MapExpression;
/**
* System 错误码枚举类
diff --git a/yudao-core-service/pom.xml b/yudao-core-service/pom.xml
index 43cdae127..72d763a99 100644
--- a/yudao-core-service/pom.xml
+++ b/yudao-core-service/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>yudao</artifactId>
<groupId>cn.iocoder.boot</groupId>
- <version>1.1.0-snapshot</version>
+ <version>1.2.0-snapshot</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 125d3bdaf..723ea0c6a 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -14,7 +14,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
- <revision>1.1.0-snapshot</revision>
+ <revision>1.2.0-snapshot</revision>
<!-- 统一依赖管理 -->
<spring.boot.version>2.4.5</spring.boot.version>
<!-- Web 相关 -->
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
index 11c5f706a..870d33718 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/controller/user/SysUserProfileController.java
@@ -55,5 +55,6 @@ public class SysUserProfileController {
public CommonResult<MbrUserInfoRespVO> getUserInfo() {
return success(userService.getUserInfo(getLoginUserId()));
}
+
}
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
index 5bff9d6cb..f340c5fe9 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/service/user/impl/MbrUserServiceImpl.java
@@ -109,6 +109,7 @@ public class MbrUserServiceImpl implements MbrUserService {
@Override
public MbrUserInfoRespVO getUserInfo(Long userId) {
MbrUserDO user = this.checkUserExists(userId);
+ // 拼接返回结果
MbrUserInfoRespVO userResp = new MbrUserInfoRespVO();
userResp.setNickName(user.getNickname());
userResp.setAvatar(user.getAvatar());
diff --git a/更新日志.md b/更新日志.md
index 206599b25..6d5ea6f95 100644
--- a/更新日志.md
+++ b/更新日志.md
@@ -3,16 +3,20 @@
* 邮件
* 钉钉、飞书等通知
-## [v1.2.0] 待定
+## [v1.3.0] 待定
* 工作流
-## [v1.1.1] 待定
+## [v1.2.0] 进行中
+
+* 新增用户前台的昵称、头像的修改
+
+TODO
* 支付
* 用户前台的社交登陆
-## [v1.1.0] 进行中
+## [v1.1.0] 2021.10.25
* 新增管理后台的企业微信、钉钉等社交登录
* 新增用户前台(例如说，用户使用的小程序)的后端项目 `yudao-user-server`