SecurityUtils 加入获取当前登录用户ID方法，Security 结构调整

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java

@@ -3,9 +3,12 @@ package me.zhengjie.modules.system.service.dto;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.security.core.GrantedAuthority;
+
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -153,7 +153,7 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Cacheable(key = "'loadPermissionByUser:' + #p0.username")
-    public Collection<GrantedAuthority> mapToGrantedAuthorities(UserDto user) {
+    public List<GrantedAuthority> mapToGrantedAuthorities(UserDto user) {
         Set<Role> roles = roleRepository.findByUsers_Id(user.getId());
         Set<String> permissions = roles.stream().filter(role -> StringUtils.isNotBlank(role.getPermission())).map(Role::getPermission).collect(Collectors.toSet());
         permissions.addAll(

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -171,7 +171,7 @@ public class UserServiceImpl implements UserService {
     @CacheEvict(allEntries = true)
     @Transactional(rollbackFor = Exception.class)
     public void updateAvatar(MultipartFile multipartFile) {
-        User user = userRepository.findByUsername(SecurityUtils.getUsername());
+        User user = userRepository.findByUsername(SecurityUtils.getCurrentUsername());
         UserAvatar userAvatar = user.getUserAvatar();
         String oldPath = "";
         if(userAvatar != null){

eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java

@@ -52,7 +52,7 @@ public class PictureController {
     @PostMapping
     @ApiOperation("上传图片")
     public ResponseEntity<Object> upload(@RequestParam MultipartFile file){
-        String userName = SecurityUtils.getUsername();
+        String userName = SecurityUtils.getCurrentUsername();
         Picture picture = pictureService.upload(file,userName);
         return new ResponseEntity<>(picture,HttpStatus.OK);
     }

eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java

@@ -94,7 +94,7 @@ public class LocalStorageServiceImpl implements LocalStorageService {
                     file.getPath(),
                     type,
                     FileUtil.getSize(multipartFile.getSize()),
-                    SecurityUtils.getUsername()
+                    SecurityUtils.getCurrentUsername()
             );
             return localStorageMapper.toDto(localStorageRepository.save(localStorage));
         }catch (Exception e){