From e9a89249dfeab0f9dbf35c4a21cda5a99327ac8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= Date: Sat, 23 Jun 2018 20:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=8A=E4=BC=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aspect/UploadAuthorizeAspect.java | 1 + .../fjy8018/fileupload/dataobject/Role.java | 4 +- .../fileupload/dataobject/RolePermission.java | 2 +- .../fileupload/dataobject/UserRole.java | 2 +- .../fileupload/service/UserService.java | 2 + .../service/impl/UserServiceImpl.java | 5 +++ .../RolePermissionRepositoryTest.java | 2 +- .../repository/UserRoleRepositoryTest.java | 2 +- .../fileupload/service/UserServiceTest.java | 40 +++++++++++++++++++ 9 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 src/test/java/top/fjy8018/fileupload/service/UserServiceTest.java diff --git a/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java b/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java index d966945..d0a088f 100644 --- a/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java +++ b/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java @@ -55,6 +55,7 @@ public class UploadAuthorizeAspect { log.info("【上传AOP】percodes:{},userPermission:{}",percodes[1],userPermission); if (!percodes[1].equals(PercodeEnum.FILE_UPLOAD.getMsg())){ + log.warn("【越权下载】"); throw new FileUploadException(ResultVOEnum.FORBIDDEN_ACCES); } diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/Role.java b/src/main/java/top/fjy8018/fileupload/dataobject/Role.java index 939b200..069b7ef 100644 --- a/src/main/java/top/fjy8018/fileupload/dataobject/Role.java +++ b/src/main/java/top/fjy8018/fileupload/dataobject/Role.java @@ -5,6 +5,7 @@ import top.fjy8018.fileupload.enums.RoleStatusEnum; import top.fjy8018.fileupload.util.KeyUtil; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Table; @@ -18,7 +19,8 @@ import javax.persistence.Table; public class Role { @Id - private String id = KeyUtil.genUniqueKey(); + @GeneratedValue + private Integer id; private String name; diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/RolePermission.java b/src/main/java/top/fjy8018/fileupload/dataobject/RolePermission.java index ef256ca..1add041 100644 --- a/src/main/java/top/fjy8018/fileupload/dataobject/RolePermission.java +++ b/src/main/java/top/fjy8018/fileupload/dataobject/RolePermission.java @@ -20,7 +20,7 @@ public class RolePermission { @GeneratedValue private Integer id; - private String sysRoleId; + private Integer sysRoleId; private Integer sysPermissionId; diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/UserRole.java b/src/main/java/top/fjy8018/fileupload/dataobject/UserRole.java index 58e3d4c..84e8ac9 100644 --- a/src/main/java/top/fjy8018/fileupload/dataobject/UserRole.java +++ b/src/main/java/top/fjy8018/fileupload/dataobject/UserRole.java @@ -22,6 +22,6 @@ public class UserRole { private String sysUserId; - private String sysRoleId; + private Integer sysRoleId; } diff --git a/src/main/java/top/fjy8018/fileupload/service/UserService.java b/src/main/java/top/fjy8018/fileupload/service/UserService.java index ff1d6cb..4aaf53e 100644 --- a/src/main/java/top/fjy8018/fileupload/service/UserService.java +++ b/src/main/java/top/fjy8018/fileupload/service/UserService.java @@ -8,4 +8,6 @@ public interface UserService { User findOneByUserName(String userName); UserPermission findPermissionByUserName(String userName); + + User saveOne(User user); } diff --git a/src/main/java/top/fjy8018/fileupload/service/impl/UserServiceImpl.java b/src/main/java/top/fjy8018/fileupload/service/impl/UserServiceImpl.java index 3ddb3d9..d3c5be8 100644 --- a/src/main/java/top/fjy8018/fileupload/service/impl/UserServiceImpl.java +++ b/src/main/java/top/fjy8018/fileupload/service/impl/UserServiceImpl.java @@ -26,6 +26,11 @@ public class UserServiceImpl implements UserService { return userPermissionRepository.findByUsername(userName); } + @Override + public User saveOne(User user) { + return userRepository.save(user); + } + @Override public User findOneByUserName(String userName) { return userRepository.findByUsername(userName); diff --git a/src/test/java/top/fjy8018/fileupload/repository/RolePermissionRepositoryTest.java b/src/test/java/top/fjy8018/fileupload/repository/RolePermissionRepositoryTest.java index 843d0f1..1f1bc8d 100644 --- a/src/test/java/top/fjy8018/fileupload/repository/RolePermissionRepositoryTest.java +++ b/src/test/java/top/fjy8018/fileupload/repository/RolePermissionRepositoryTest.java @@ -15,7 +15,7 @@ public class RolePermissionRepositoryTest extends EstestApplicationTests { @Autowired private RolePermissionRepository repository; - private static final String ROLE_ID = "1529723184401294213"; + private static final Integer ROLE_ID = 2; private static final Integer PERMISSION_ID = 3; diff --git a/src/test/java/top/fjy8018/fileupload/repository/UserRoleRepositoryTest.java b/src/test/java/top/fjy8018/fileupload/repository/UserRoleRepositoryTest.java index 3a89233..e3aa3e4 100644 --- a/src/test/java/top/fjy8018/fileupload/repository/UserRoleRepositoryTest.java +++ b/src/test/java/top/fjy8018/fileupload/repository/UserRoleRepositoryTest.java @@ -17,7 +17,7 @@ public class UserRoleRepositoryTest extends EstestApplicationTests { @Autowired private UserRoleRepository repository; - private static final String ROLE_ID = "1529723184401294213"; + private static final Integer ROLE_ID = 2; private static final String USER_ID = "1529723171835369380"; diff --git a/src/test/java/top/fjy8018/fileupload/service/UserServiceTest.java b/src/test/java/top/fjy8018/fileupload/service/UserServiceTest.java new file mode 100644 index 0000000..4cc0ac7 --- /dev/null +++ b/src/test/java/top/fjy8018/fileupload/service/UserServiceTest.java @@ -0,0 +1,40 @@ +package top.fjy8018.fileupload.service; + +import org.junit.Assert; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import top.fjy8018.fileupload.EstestApplicationTests; +import top.fjy8018.fileupload.dataobject.User; + +import javax.transaction.Transactional; + +import static org.junit.Assert.*; + +@Component +public class UserServiceTest extends EstestApplicationTests{ + + @Autowired + private UserService userService; + + @Test + @Transactional + public void addOne() { + User user = new User(); + user.setUsername("FJY"); + user.setPassword("trs"); + user.setUsercode("admin"); + + User res = userService.saveOne(user); + + Assert.assertNotNull(res); + } + + @Test + public void findOneByUserName() { + } + + @Test + public void findPermissionByUserName() { + } +} \ No newline at end of file