欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 21780d81067e48a1e13cd52520392290e025a95b 1 个父辈 b7b4364d

优化代码

内嵌 并排对比
正在显示 5 个修改的文件 包含 7 行增加 和 13 行删除
@@ -121,10 +121,7 @@ public class FileUploadUtils @@ -121,10 +121,7 @@ public class FileUploadUtils
121 */ 121 */
122 public static final String extractFilename(MultipartFile file) 122 public static final String extractFilename(MultipartFile file)
123 { 123 {
124 - String fileName = file.getOriginalFilename();  
125 - String extension = getExtension(file);  
126 - fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;  
127 - return fileName; 124 + return DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + getExtension(file);
128 } 125 }
129 126
130 public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException 127 public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
1 package com.ruoyi.common.utils.file; 1 package com.ruoyi.common.utils.file;
2 2
3 import java.io.ByteArrayInputStream; 3 import java.io.ByteArrayInputStream;
4 -import java.io.ByteArrayOutputStream;  
5 import java.io.FileInputStream; 4 import java.io.FileInputStream;
6 import java.io.InputStream; 5 import java.io.InputStream;
7 import java.net.URL; 6 import java.net.URL;
@@ -65,7 +64,6 @@ public class ImageUtils @@ -65,7 +64,6 @@ public class ImageUtils
65 public static byte[] readFile(String url) 64 public static byte[] readFile(String url)
66 { 65 {
67 InputStream in = null; 66 InputStream in = null;
68 - ByteArrayOutputStream baos = null;  
69 try 67 try
70 { 68 {
71 if (url.startsWith("http")) 69 if (url.startsWith("http"))
@@ -95,7 +93,6 @@ public class ImageUtils @@ -95,7 +93,6 @@ public class ImageUtils
95 finally 93 finally
96 { 94 {
97 IOUtils.closeQuietly(in); 95 IOUtils.closeQuietly(in);
98 - IOUtils.closeQuietly(baos);  
99 } 96 }
100 } 97 }
101 } 98 }
@@ -20,7 +20,7 @@ public interface SysUserMapper @@ -20,7 +20,7 @@ public interface SysUserMapper
20 public List<SysUser> selectUserList(SysUser sysUser); 20 public List<SysUser> selectUserList(SysUser sysUser);
21 21
22 /** 22 /**
23 - * 根据条件分页查询未已配用户角色列表 23 + * 根据条件分页查询已配用户角色列表
24 * 24 *
25 * @param user 用户信息 25 * @param user 用户信息
26 * @return 用户信息集合信息 26 * @return 用户信息集合信息
@@ -404,7 +404,7 @@ public class SysRoleServiceImpl implements ISysRoleService @@ -404,7 +404,7 @@ public class SysRoleServiceImpl implements ISysRoleService
404 * 批量选择授权用户角色 404 * 批量选择授权用户角色
405 * 405 *
406 * @param roleId 角色ID 406 * @param roleId 角色ID
407 - * @param userIds 需要删除的用户数据ID 407 + * @param userIds 需要授权的用户数据ID
408 * @return 结果 408 * @return 结果
409 */ 409 */
410 @Override 410 @Override
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 </resultMap> 28 </resultMap>
29 29
30 <sql id="selectMenuVo"> 30 <sql id="selectMenuVo">
31 - select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 31 + select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
32 from sys_menu 32 from sys_menu
33 </sql> 33 </sql>
34 34
@@ -49,13 +49,13 @@ @@ -49,13 +49,13 @@
49 </select> 49 </select>
50 50
51 <select id="selectMenuTreeAll" resultMap="SysMenuResult"> 51 <select id="selectMenuTreeAll" resultMap="SysMenuResult">
52 - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time 52 + select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
53 from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 53 from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
54 order by m.parent_id, m.order_num 54 order by m.parent_id, m.order_num
55 </select> 55 </select>
56 56
57 <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult"> 57 <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
58 - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time 58 + select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
59 from sys_menu m 59 from sys_menu m
60 left join sys_role_menu rm on m.menu_id = rm.menu_id 60 left join sys_role_menu rm on m.menu_id = rm.menu_id
61 left join sys_user_role ur on rm.role_id = ur.role_id 61 left join sys_user_role ur on rm.role_id = ur.role_id
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 </select> 74 </select>
75 75
76 <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult"> 76 <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
77 - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time 77 + select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
78 from sys_menu m 78 from sys_menu m
79 left join sys_role_menu rm on m.menu_id = rm.menu_id 79 left join sys_role_menu rm on m.menu_id = rm.menu_id
80 left join sys_user_role ur on rm.role_id = ur.role_id 80 left join sys_user_role ur on rm.role_id = ur.role_id