阿里巴巴代码规范

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

@@ -10,9 +10,9 @@ import me.zhengjie.exception.EntityExistException;
 import me.zhengjie.modules.system.repository.MenuRepository;
 import me.zhengjie.modules.system.service.MenuService;
 import me.zhengjie.modules.system.service.RoleService;
-import me.zhengjie.modules.system.service.dto.MenuDTO;
+import me.zhengjie.modules.system.service.dto.MenuDto;
 import me.zhengjie.modules.system.service.dto.MenuQueryCriteria;
-import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
+import me.zhengjie.modules.system.service.dto.RoleSmallDto;
 import me.zhengjie.modules.system.service.mapper.MenuMapper;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.QueryHelp;
@@ -21,7 +21,6 @@ import me.zhengjie.utils.ValidationUtil;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +29,9 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+/**
+ * @author Zheng Jie
+ */
 @Service
 @CacheConfig(cacheNames = "menu")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
@@ -49,23 +51,23 @@ public class MenuServiceImpl implements MenuService {
 
     @Override
     @Cacheable
-    public List<MenuDTO> queryAll(MenuQueryCriteria criteria){
+    public List<MenuDto> queryAll(MenuQueryCriteria criteria){
 //        Sort sort = new Sort(Sort.Direction.DESC,"id");
         return menuMapper.toDto(menuRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
     }
 
     @Override
     @Cacheable(key = "#p0")
-    public MenuDTO findById(long id) {
+    public MenuDto findById(long id) {
         Menu menu = menuRepository.findById(id).orElseGet(Menu::new);
         ValidationUtil.isNull(menu.getId(),"Menu","id",id);
         return menuMapper.toDto(menu);
     }
 
     @Override
-    public List<MenuDTO> findByRoles(List<RoleSmallDTO> roles) {
+    public List<MenuDto> findByRoles(List<RoleSmallDto> roles) {
         Set<Menu> menus = new LinkedHashSet<>();
-        for (RoleSmallDTO role : roles) {
+        for (RoleSmallDto role : roles) {
             List<Menu> menus1 = new ArrayList<>(menuRepository.findByRoles_IdAndTypeIsNotInOrderBySortAsc(role.getId(), 2));
             menus.addAll(menus1);
         }
@@ -74,7 +76,7 @@ public class MenuServiceImpl implements MenuService {
 
     @Override
     @CacheEvict(allEntries = true)
-    public MenuDTO create(Menu resources) {
+    public MenuDto create(Menu resources) {
         if(menuRepository.findByName(resources.getName()) != null){
             throw new EntityExistException(Menu.class,"name",resources.getName());
         }
@@ -84,7 +86,8 @@ public class MenuServiceImpl implements MenuService {
             }
         }
         if(resources.getIFrame()){
-            if (!(resources.getPath().toLowerCase().startsWith("http://")||resources.getPath().toLowerCase().startsWith("https://"))) {
+            String http = "http://", https = "https://";
+            if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) {
                 throw new BadRequestException("外链必须以http://或者https://开头");
             }
         }
@@ -101,7 +104,8 @@ public class MenuServiceImpl implements MenuService {
         ValidationUtil.isNull(menu.getId(),"Permission","id",resources.getId());
 
         if(resources.getIFrame()){
-            if (!(resources.getPath().toLowerCase().startsWith("http://")||resources.getPath().toLowerCase().startsWith("https://"))) {
+            String http = "http://", https = "https://";
+            if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) {
                 throw new BadRequestException("外链必须以http://或者https://开头");
             }
         }
@@ -162,7 +166,7 @@ public class MenuServiceImpl implements MenuService {
         menus.forEach(menu -> {
                     if (menu!=null){
                         List<Menu> menuList = menuRepository.findByPid(menu.getId());
-                        Map<String,Object> map = new HashMap<>();
+                        Map<String,Object> map = new HashMap<>(16);
                         map.put("id",menu.getId());
                         map.put("label",menu.getName());
                         if(menuList!=null && menuList.size()!=0){
@@ -182,14 +186,14 @@ public class MenuServiceImpl implements MenuService {
     }
 
     @Override
-    public Map<String,Object> buildTree(List<MenuDTO> menuDTOS) {
-        List<MenuDTO> trees = new ArrayList<>();
+    public Map<String,Object> buildTree(List<MenuDto> menuDtos) {
+        List<MenuDto> trees = new ArrayList<>();
         Set<Long> ids = new HashSet<>();
-        for (MenuDTO menuDTO : menuDTOS) {
+        for (MenuDto menuDTO : menuDtos) {
             if (menuDTO.getPid() == 0) {
                 trees.add(menuDTO);
             }
-            for (MenuDTO it : menuDTOS) {
+            for (MenuDto it : menuDtos) {
                 if (it.getPid().equals(menuDTO.getId())) {
                     if (menuDTO.getChildren() == null) {
                         menuDTO.setChildren(new ArrayList<>());
@@ -199,21 +203,21 @@ public class MenuServiceImpl implements MenuService {
                 }
             }
         }
-        Map<String,Object> map = new HashMap<>();
+        Map<String,Object> map = new HashMap<>(2);
         if(trees.size() == 0){
-            trees = menuDTOS.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList());
+            trees = menuDtos.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList());
         }
         map.put("content",trees);
-        map.put("totalElements", menuDTOS.size());
+        map.put("totalElements", menuDtos.size());
         return map;
     }
 
     @Override
-    public List<MenuVo> buildMenus(List<MenuDTO> menuDTOS) {
+    public List<MenuVo> buildMenus(List<MenuDto> menuDtos) {
         List<MenuVo> list = new LinkedList<>();
-        menuDTOS.forEach(menuDTO -> {
+        menuDtos.forEach(menuDTO -> {
             if (menuDTO!=null){
-                List<MenuDTO> menuDTOList = menuDTO.getChildren();
+                List<MenuDto> menuDtoList = menuDTO.getChildren();
                 MenuVo menuVo = new MenuVo();
                 menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponentName())  ? menuDTO.getComponentName() : menuDTO.getName());
                 // 一级目录需要加斜杠，不然会报警告
@@ -228,10 +232,10 @@ public class MenuServiceImpl implements MenuService {
                     }
                 }
                 menuVo.setMeta(new MenuMetaVo(menuDTO.getName(),menuDTO.getIcon(),!menuDTO.getCache()));
-                if(menuDTOList!=null && menuDTOList.size()!=0){
+                if(menuDtoList !=null && menuDtoList.size()!=0){
                     menuVo.setAlwaysShow(true);
                     menuVo.setRedirect("noredirect");
-                    menuVo.setChildren(buildMenus(menuDTOList));
+                    menuVo.setChildren(buildMenus(menuDtoList));
                     // 处理是一级菜单并且没有子菜单的情况
                 } else if(menuDTO.getPid() == 0){
                     MenuVo menuVo1 = new MenuVo();
@@ -266,9 +270,9 @@ public class MenuServiceImpl implements MenuService {
     }
 
     @Override
-    public void download(List<MenuDTO> menuDTOS, HttpServletResponse response) throws IOException {
+    public void download(List<MenuDto> menuDtos, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
-        for (MenuDTO menuDTO : menuDTOS) {
+        for (MenuDto menuDTO : menuDtos) {
             Map<String,Object> map = new LinkedHashMap<>();
             map.put("菜单名称", menuDTO.getName());
             map.put("菜单类型", menuDTO.getType() == 0 ? "目录" : menuDTO.getType() == 1 ? "菜单" : "按钮");

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

@@ -4,9 +4,9 @@ import me.zhengjie.modules.system.domain.Role;
 import me.zhengjie.exception.EntityExistException;
 import me.zhengjie.modules.system.repository.RoleRepository;
 import me.zhengjie.modules.system.service.RoleService;
-import me.zhengjie.modules.system.service.dto.RoleDTO;
+import me.zhengjie.modules.system.service.dto.RoleDto;
 import me.zhengjie.modules.system.service.dto.RoleQueryCriteria;
-import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
+import me.zhengjie.modules.system.service.dto.RoleSmallDto;
 import me.zhengjie.modules.system.service.mapper.RoleMapper;
 import me.zhengjie.modules.system.service.mapper.RoleSmallMapper;
 import me.zhengjie.utils.FileUtil;
@@ -56,7 +56,7 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Cacheable
-    public List<RoleDTO> queryAll(RoleQueryCriteria criteria) {
+    public List<RoleDto> queryAll(RoleQueryCriteria criteria) {
         return roleMapper.toDto(roleRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
     }
 
@@ -69,7 +69,7 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Cacheable(key = "#p0")
-    public RoleDTO findById(long id) {
+    public RoleDto findById(long id) {
         Role role = roleRepository.findById(id).orElseGet(Role::new);
         ValidationUtil.isNull(role.getId(),"Role","id",id);
         return roleMapper.toDto(role);
@@ -78,7 +78,7 @@ public class RoleServiceImpl implements RoleService {
     @Override
     @CacheEvict(allEntries = true)
     @Transactional(rollbackFor = Exception.class)
-    public RoleDTO create(Role resources) {
+    public RoleDto create(Role resources) {
         if(roleRepository.findByName(resources.getName()) != null){
             throw new EntityExistException(Role.class,"username",resources.getName());
         }
@@ -108,7 +108,7 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @CacheEvict(allEntries = true)
-    public void updateMenu(Role resources, RoleDTO roleDTO) {
+    public void updateMenu(Role resources, RoleDto roleDTO) {
         Role role = roleMapper.toEntity(roleDTO);
         role.setMenus(resources.getMenus());
         roleRepository.save(role);
@@ -130,24 +130,24 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Cacheable(key = "'findByUsers_Id:' + #p0")
-    public List<RoleSmallDTO> findByUsers_Id(Long id) {
+    public List<RoleSmallDto> findByUsersId(Long id) {
         return roleSmallMapper.toDto(new ArrayList<>(roleRepository.findByUsers_Id(id)));
     }
 
     @Override
     @Cacheable
     public Integer findByRoles(Set<Role> roles) {
-        Set<RoleDTO> roleDTOS = new HashSet<>();
+        Set<RoleDto> roleDtos = new HashSet<>();
         for (Role role : roles) {
-            roleDTOS.add(findById(role.getId()));
+            roleDtos.add(findById(role.getId()));
         }
-        return Collections.min(roleDTOS.stream().map(RoleDTO::getLevel).collect(Collectors.toList()));
+        return Collections.min(roleDtos.stream().map(RoleDto::getLevel).collect(Collectors.toList()));
     }
 
     @Override
-    public void download(List<RoleDTO> roles, HttpServletResponse response) throws IOException {
+    public void download(List<RoleDto> roles, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
-        for (RoleDTO role : roles) {
+        for (RoleDto role : roles) {
             Map<String,Object> map = new LinkedHashMap<>();
             map.put("角色名称", role.getName());
             map.put("默认权限", role.getPermission());

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

@@ -8,8 +8,8 @@ import me.zhengjie.modules.system.domain.UserAvatar;
 import me.zhengjie.modules.system.repository.UserAvatarRepository;
 import me.zhengjie.modules.system.repository.UserRepository;
 import me.zhengjie.modules.system.service.UserService;
-import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
-import me.zhengjie.modules.system.service.dto.UserDTO;
+import me.zhengjie.modules.system.service.dto.RoleSmallDto;
+import me.zhengjie.modules.system.service.dto.UserDto;
 import me.zhengjie.modules.system.service.dto.UserQueryCriteria;
 import me.zhengjie.modules.system.service.mapper.UserMapper;
 import me.zhengjie.utils.*;
@@ -65,14 +65,14 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Cacheable
-    public List<UserDTO> queryAll(UserQueryCriteria criteria) {
+    public List<UserDto> queryAll(UserQueryCriteria criteria) {
         List<User> users = userRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder));
         return userMapper.toDto(users);
     }
 
     @Override
     @Cacheable(key = "#p0")
-    public UserDTO findById(long id) {
+    public UserDto findById(long id) {
         User user = userRepository.findById(id).orElseGet(User::new);
         ValidationUtil.isNull(user.getId(),"User","id",id);
         return userMapper.toDto(user);
@@ -81,7 +81,7 @@ public class UserServiceImpl implements UserService {
     @Override
     @CacheEvict(allEntries = true)
     @Transactional(rollbackFor = Exception.class)
-    public UserDTO create(User resources) {
+    public UserDto create(User resources) {
 
         if(userRepository.findByUsername(resources.getUsername())!=null){
             throw new EntityExistException(User.class,"username",resources.getUsername());
@@ -140,7 +140,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Cacheable(key = "'loadUserByUsername:'+#p0")
-    public UserDTO findByName(String userName) {
+    public UserDto findByName(String userName) {
         User user;
         if(ValidationUtil.isEmail(userName)){
             user = userRepository.findByEmail(userName);
@@ -189,10 +189,10 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public void download(List<UserDTO> queryAll, HttpServletResponse response) throws IOException {
+    public void download(List<UserDto> queryAll, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
-        for (UserDTO userDTO : queryAll) {
-            List roles = userDTO.getRoles().stream().map(RoleSmallDTO::getName).collect(Collectors.toList());
+        for (UserDto userDTO : queryAll) {
+            List roles = userDTO.getRoles().stream().map(RoleSmallDto::getName).collect(Collectors.toList());
             Map<String,Object> map = new LinkedHashMap<>();
             map.put("用户名", userDTO.getUsername());
             map.put("头像", userDTO.getAvatar());

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Dept;
-import me.zhengjie.modules.system.service.dto.DeptDTO;
+import me.zhengjie.modules.system.service.dto.DeptDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-03-25
 */
 @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DeptMapper extends BaseMapper<DeptDTO, Dept> {
+public interface DeptMapper extends BaseMapper<DeptDto, Dept> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Dept;
-import me.zhengjie.modules.system.service.dto.DeptSmallDTO;
+import me.zhengjie.modules.system.service.dto.DeptSmallDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-03-25
 */
 @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DeptSmallMapper extends BaseMapper<DeptSmallDTO, Dept> {
+public interface DeptSmallMapper extends BaseMapper<DeptSmallDto, Dept> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.DictDetail;
-import me.zhengjie.modules.system.service.dto.DictDetailDTO;
+import me.zhengjie.modules.system.service.dto.DictDetailDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-04-10
 */
 @Mapper(componentModel = "spring", uses = {DictSmallMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DictDetailMapper extends BaseMapper<DictDetailDTO, DictDetail> {
+public interface DictDetailMapper extends BaseMapper<DictDetailDto, DictDetail> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Dict;
-import me.zhengjie.modules.system.service.dto.DictDTO;
+import me.zhengjie.modules.system.service.dto.DictDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-04-10
 */
 @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DictMapper extends BaseMapper<DictDTO, Dict> {
+public interface DictMapper extends BaseMapper<DictDto, Dict> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java

@@ -2,8 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Dict;
-import me.zhengjie.modules.system.service.dto.DictDTO;
-import me.zhengjie.modules.system.service.dto.DictSmallDTO;
+import me.zhengjie.modules.system.service.dto.DictSmallDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -12,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-04-10
 */
 @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DictSmallMapper extends BaseMapper<DictSmallDTO, Dict> {
+public interface DictSmallMapper extends BaseMapper<DictSmallDto, Dict> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Job;
-import me.zhengjie.modules.system.service.dto.JobDTO;
+import me.zhengjie.modules.system.service.dto.JobDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
@@ -12,8 +12,14 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-03-29
 */
 @Mapper(componentModel = "spring",uses = {DeptMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface JobMapper extends BaseMapper<JobDTO, Job> {
+public interface JobMapper extends BaseMapper<JobDto, Job> {
 
+    /**
+     * 转Dto
+     * @param job 原始数据
+     * @param deptSuperiorName /
+     * @return /
+     */
     @Mapping(source = "deptSuperiorName", target = "deptSuperiorName")
-    JobDTO toDto(Job job, String deptSuperiorName);
+    JobDto toDto(Job job, String deptSuperiorName);
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Job;
-import me.zhengjie.modules.system.service.dto.JobSmallDTO;
+import me.zhengjie.modules.system.service.dto.JobSmallDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
 * @date 2019-03-29
 */
 @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface JobSmallMapper extends BaseMapper<JobSmallDTO, Job> {
+public interface JobSmallMapper extends BaseMapper<JobSmallDto, Job> {
 
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Menu;
-import me.zhengjie.modules.system.service.dto.MenuDTO;
+import me.zhengjie.modules.system.service.dto.MenuDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
  * @date 2018-12-17
  */
 @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface MenuMapper extends BaseMapper<MenuDTO, Menu> {
+public interface MenuMapper extends BaseMapper<MenuDto, Menu> {
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Role;
-import me.zhengjie.modules.system.service.dto.RoleDTO;
+import me.zhengjie.modules.system.service.dto.RoleDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
  * @date 2018-11-23
  */
 @Mapper(componentModel = "spring", uses = {MenuMapper.class, DeptMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface RoleMapper extends BaseMapper<RoleDTO, Role> {
+public interface RoleMapper extends BaseMapper<RoleDto, Role> {
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.Role;
-import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
+import me.zhengjie.modules.system.service.dto.RoleSmallDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
@@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy;
  * @date 2019-5-23
  */
 @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface RoleSmallMapper extends BaseMapper<RoleSmallDTO, Role> {
+public interface RoleSmallMapper extends BaseMapper<RoleSmallDto, Role> {
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java

@@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
 import me.zhengjie.modules.system.domain.User;
-import me.zhengjie.modules.system.service.dto.UserDTO;
+import me.zhengjie.modules.system.service.dto.UserDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
@@ -12,8 +12,14 @@ import org.mapstruct.ReportingPolicy;
  * @date 2018-11-23
  */
 @Mapper(componentModel = "spring",uses = {RoleMapper.class, DeptMapper.class, JobMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface UserMapper extends BaseMapper<UserDTO, User> {
+public interface UserMapper extends BaseMapper<UserDto, User> {
 
+    /**
+     * 转换
+     * @param user 原始数据
+     * @return /
+     */
+    @Override
     @Mapping(source = "user.userAvatar.realName",target = "avatar")
-    UserDTO toDto(User user);
+    UserDto toDto(User user);
 }

eladmin-system/src/main/resources/template/generator/admin/Service.ftl

 package ${package}.service;
 
 import ${package}.domain.${className};
-import ${package}.service.dto.${className}DTO;
+import ${package}.service.dto.${className}Dto;
 import ${package}.service.dto.${className}QueryCriteria;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
@@ -26,18 +26,18 @@ public interface ${className}Service {
     /**
     * 查询所有数据不分页
     * @param criteria 条件参数
-    * @return List<${className}DTO>
+    * @return List<${className}Dto>
     */
-    List<${className}DTO> queryAll(${className}QueryCriteria criteria);
+    List<${className}Dto> queryAll(${className}QueryCriteria criteria);
 
     /**
      * 根据ID查询
      * @param ${pkChangeColName} ID
-     * @return ${className}DTO
+     * @return ${className}Dto
      */
-    ${className}DTO findById(${pkColumnType} ${pkChangeColName});
+    ${className}Dto findById(${pkColumnType} ${pkChangeColName});
 
-    ${className}DTO create(${className} resources);
+    ${className}Dto create(${className} resources);
 
     void update(${className} resources);
 
@@ -45,5 +45,5 @@ public interface ${className}Service {
 
     void deleteAll(${pkColumnType}[] ids);
 
-    void download(List<${className}DTO> all, HttpServletResponse response) throws IOException;
+    void download(List<${className}Dto> all, HttpServletResponse response) throws IOException;
 }
\ No newline at end of file

eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java

@@ -18,46 +18,46 @@ public class AlipayConfig implements Serializable {
     @Id
     private Long id;
 
-    // 应用ID,APPID，收款账号既是APPID对应支付宝账号
+    /** 应用ID,APPID，收款账号既是APPID对应支付宝账号 */
     @NotBlank
     @Column(name = "app_id")
-    private String appID;
+    private String appId;
 
-    // 商户私钥，您的PKCS8格式RSA2私钥
+    /** 商户私钥，您的PKCS8格式RSA2私钥 */
     @NotBlank
     @Column(name = "private_key", columnDefinition = "text")
     private String privateKey;
 
-    // 支付宝公钥
+    /** 支付宝公钥 */
     @NotBlank
     @Column(name = "public_key", columnDefinition = "text")
     private String publicKey;
 
-    // 签名方式，固定格式
+    /** 签名方式，固定格式 */
     @Column(name = "sign_type")
     private String signType="RSA2";
 
-    // 支付宝开放安全地址，一般不会变
+    /** 支付宝开放安全地址，一般不会变 */
     @Column(name = "gateway_url")
     private String gatewayUrl = "https://openapi.alipaydev.com/gateway.do";
 
-    // 编码，固定格式
+    /** 编码，固定格式 */
     private String charset= "utf-8";
 
-    // 异步通知地址
+    /** 异步通知地址 */
     @NotBlank
     @Column(name = "notify_url")
     private String notifyUrl;
 
-    // 订单完成后返回的页面
+    /** 订单完成后返回的页面 */
     @NotBlank
     @Column(name = "return_url")
     private String returnUrl;
 
-    // 类型，固定格式
+    /** 类型，固定格式 */
     private String format="JSON";
 
-    // 商户号
+    /** 商户号 */
     @NotBlank
     @Column(name = "sys_service_provider_id")
     private String sysServiceProviderId;

eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java

@@ -19,22 +19,22 @@ public class EmailConfig implements Serializable {
     @Id
     private Long id;
 
-    // 邮件服务器SMTP地址
+    /** 邮件服务器SMTP地址 */
     @NotBlank
     private String host;
 
-    // 邮件服务器SMTP端口
+    /** 邮件服务器 SMTP 端口 */
     @NotBlank
     private String port;
 
-    // 发件者用户名，默认为发件人邮箱前缀
+    /** 发件者用户名，默认为发件人邮箱前缀 */
     @NotBlank
     private String user;
 
     @NotBlank
     private String pass;
 
-    // 收件人
+    /** 收件人 */
     @NotBlank
     @Column(name = "from_user")
     private String fromUser;

eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java

@@ -25,31 +25,31 @@ public class LocalStorage  implements Serializable {
     @Column(name = "id")
     private Long id;
 
-    // 真实文件名
+    /** 真实文件名 */
     @Column(name = "real_name")
     private String realName;
 
-    // 文件名
+    /**文件名 */
     @Column(name = "name")
     private String name;
 
-    // 后缀
+    /**后缀 */
     @Column(name = "suffix")
     private String suffix;
 
-    // 路径
+    /** 路径 */
     @Column(name = "path")
     private String path;
 
-    // 类型
+    /** 类型 */
     @Column(name = "type")
     private String type;
 
-    // 大小
+    /** 大小 */
     @Column(name = "size")
     private String size;
 
-    // 操作人
+    /** 操作人 */
     @Column(name = "operate")
     private String operate;
 

eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java

@@ -41,7 +41,7 @@ public class Picture implements Serializable {
     @Column(name = "create_time")
     private Timestamp createTime;
 
-    // 用于检测文件是否重复
+    /** 用于检测文件是否重复 */
     private String md5Code;
 
     @Override

eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java

@@ -18,17 +18,17 @@ public class QiniuConfig implements Serializable {
     @Id
     private Long id;
 
-    // 一个账号最多拥有两对密钥(Access/Secret Key)
+    /** 一个账号最多拥有两对密钥(Access/Secret Key) */
     @NotBlank
     @Column(name = "access_key", columnDefinition = "text")
     private String accessKey;
 
-    // 一个账号最多拥有两对密钥(Access/Secret Key)
+    /** 一个账号最多拥有两对密钥(Access/Secret Key) */
     @NotBlank
     @Column(name = "secret_key", columnDefinition = "text")
     private String secretKey;
 
-    // 存储空间名称作为唯一的 Bucket 识别符
+    /** 存储空间名称作为唯一的 Bucket 识别符 */
     @NotBlank
     private String bucket;
 
@@ -43,10 +43,10 @@ public class QiniuConfig implements Serializable {
     @NotBlank
     private String zone;
 
-    // 外链域名，可自定义，需在七牛云绑定
+    /** 外链域名，可自定义，需在七牛云绑定 */
     @NotBlank
     private String host;
 
-    // 空间类型：公开/私有
+    /** 空间类型：公开/私有 */
     private String type = "公开";
 }