From f6de03a009fc1f2d8755f33882b259f3c54d531a Mon Sep 17 00:00:00 2001 From: abbfun <819589789@qq.com> Date: Fri, 19 Jun 2020 10:00:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?update=20ruoyi-ui/src/views/monitor/job/log?= =?UTF-8?q?.vue.=20data=E5=AF=B9=E8=B1=A1=E4=B8=AD=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E3=80=90=E8=A1=A8=E5=8D=95=E5=8F=82=E6=95=B0form=E3=80=91?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/monitor/job/log.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 4ead63406..254f48618 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -196,9 +196,7 @@ export default { jobName: undefined, jobGroup: undefined, status: undefined - }, - // 表单参数 - form: {} + } }; }, created() { From 9ea0041fabffb1610dbec0d71ae7f79db1206598 Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 19 Jun 2020 16:01:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B8=B8=E9=87=8F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B8=B8=E9=87=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java | 2 +- .../main/java/com/ruoyi/common/constant/ScheduleConstants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java index ffdb56d0d..77a479b3c 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java @@ -5,7 +5,7 @@ package com.ruoyi.common.constant; * * @author ruoyi */ -public interface HttpStatus +public class HttpStatus { /** * 操作成功 diff --git a/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java index 005e17623..62ad81545 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java @@ -5,7 +5,7 @@ package com.ruoyi.common.constant; * * @author ruoyi */ -public interface ScheduleConstants +public class ScheduleConstants { public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; From f5badba2bb9f40695ab5d1e362a3f63298989a4d Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 19 Jun 2020 18:13:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0{}=E4=BD=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9B=B4=E5=AE=B9=E6=98=93=E7=90=86=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/utils/VerifyCodeUtils.java | 6 ++++-- .../com/ruoyi/common/utils/ip/IpUtils.java | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java index 80b8c84fe..04171810f 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java @@ -139,10 +139,12 @@ public class VerifyCodeUtils private static Color getRandColor(int fc, int bc) { - if (fc > 255) + if (fc > 255) { fc = 255; - if (bc > 255) + } + if (bc > 255) { bc = 255; + } int r = fc + random.nextInt(bc - fc); int g = fc + random.nextInt(bc - fc); int b = fc + random.nextInt(bc - fc); diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java index b9f13735c..771e3f840 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java @@ -110,8 +110,9 @@ public class IpUtils { case 1: l = Long.parseLong(elements[0]); - if ((l < 0L) || (l > 4294967295L)) + if ((l < 0L) || (l > 4294967295L)) { return null; + } bytes[0] = (byte) (int) (l >> 24 & 0xFF); bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF); bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); @@ -119,12 +120,14 @@ public class IpUtils break; case 2: l = Integer.parseInt(elements[0]); - if ((l < 0L) || (l > 255L)) + if ((l < 0L) || (l > 255L)) { return null; + } bytes[0] = (byte) (int) (l & 0xFF); l = Integer.parseInt(elements[1]); - if ((l < 0L) || (l > 16777215L)) + if ((l < 0L) || (l > 16777215L)) { return null; + } bytes[1] = (byte) (int) (l >> 16 & 0xFF); bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); bytes[3] = (byte) (int) (l & 0xFF); @@ -133,13 +136,15 @@ public class IpUtils for (i = 0; i < 2; ++i) { l = Integer.parseInt(elements[i]); - if ((l < 0L) || (l > 255L)) + if ((l < 0L) || (l > 255L)) { return null; + } bytes[i] = (byte) (int) (l & 0xFF); } l = Integer.parseInt(elements[2]); - if ((l < 0L) || (l > 65535L)) + if ((l < 0L) || (l > 65535L)) { return null; + } bytes[2] = (byte) (int) (l >> 8 & 0xFF); bytes[3] = (byte) (int) (l & 0xFF); break; @@ -147,8 +152,9 @@ public class IpUtils for (i = 0; i < 4; ++i) { l = Integer.parseInt(elements[i]); - if ((l < 0L) || (l > 255L)) + if ((l < 0L) || (l > 255L)) { return null; + } bytes[i] = (byte) (int) (l & 0xFF); } break; From f39be3ab9b6bfdb6836ee400323047089a0266b6 Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 19 Jun 2020 18:17:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E7=9A=84@=20Override?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java | 3 +++ .../framework/config/FastJson2JsonRedisSerializer.java | 2 ++ .../monitor/service/impl/SysOperLogServiceImpl.java | 1 + .../java/com/ruoyi/project/system/domain/SysRole.java | 1 + .../project/system/service/impl/SysConfigServiceImpl.java | 1 + .../system/service/impl/SysDictDataServiceImpl.java | 1 + .../system/service/impl/SysDictTypeServiceImpl.java | 3 +++ .../project/system/service/impl/SysMenuServiceImpl.java | 1 + .../project/system/service/impl/SysNoticeServiceImpl.java | 1 + .../project/system/service/impl/SysPostServiceImpl.java | 2 ++ .../project/system/service/impl/SysRoleServiceImpl.java | 6 ++++++ .../system/service/impl/SysUserOnlineServiceImpl.java | 1 + .../project/system/service/impl/SysUserServiceImpl.java | 5 ++++- .../project/tool/gen/service/GenTableServiceImpl.java | 8 ++++++-- 14 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java index 9e1bbeb32..fa7429774 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java @@ -376,6 +376,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return UUID 的哈希码值。 */ + @Override public int hashCode() { long hilo = mostSigBits ^ leastSigBits; @@ -391,6 +392,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false} */ + @Override public boolean equals(Object obj) { if ((null == obj) || (obj.getClass() != UUID.class)) @@ -414,6 +416,7 @@ public final class UUID implements java.io.Serializable, Comparable * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。 * */ + @Override public int compareTo(UUID val) { // The ordering is intentionally set up so that the UUIDs diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java index b623cae59..56bbdbfab 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java @@ -36,6 +36,7 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer this.clazz = clazz; } + @Override public byte[] serialize(T t) throws SerializationException { if (t == null) @@ -45,6 +46,7 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET); } + @Override public T deserialize(byte[] bytes) throws SerializationException { if (bytes == null || bytes.length <= 0) diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java index 65193dd89..954bc08f7 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java @@ -47,6 +47,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService * @param operIds 需要删除的操作日志ID * @return 结果 */ + @Override public int deleteOperLogByIds(Long[] operIds) { return operLogMapper.deleteOperLogByIds(operIds); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java index ca33e32d1..677c2e461 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java @@ -178,6 +178,7 @@ public class SysRole extends BaseEntity this.deptIds = deptIds; } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("roleId", getRoleId()) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java index e0b008ca8..88f5475d6 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java @@ -147,6 +147,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 清空缓存数据 */ + @Override public void clearCache() { Collection keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java index 05c2a8d59..065a2ce80 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java @@ -62,6 +62,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService * @param dictCodes 需要删除的字典数据ID * @return 结果 */ + @Override public int deleteDictDataByIds(Long[] dictCodes) { int row = dictDataMapper.deleteDictDataByIds(dictCodes); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java index 4f6f4c561..10fe23bcb 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java @@ -107,6 +107,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * @param dictType 字典类型 * @return 字典类型 */ + @Override public SysDictType selectDictTypeByType(String dictType) { return dictTypeMapper.selectDictTypeByType(dictType); @@ -118,6 +119,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * @param dictIds 需要删除的字典ID * @return 结果 */ + @Override public int deleteDictTypeByIds(Long[] dictIds) { for (Long dictId : dictIds) @@ -139,6 +141,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 清空缓存数据 */ + @Override public void clearCache() { DictUtils.clearDictCache(); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java index 56900efc5..e5dda00f9 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java @@ -121,6 +121,7 @@ public class SysMenuServiceImpl implements ISysMenuService * @param roleId 角色ID * @return 选中菜单列表 */ + @Override public List selectMenuListByRoleId(Long roleId) { return menuMapper.selectMenuListByRoleId(roleId); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java index 8d0f372f6..2b0191d4a 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java @@ -84,6 +84,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService * @param noticeIds 需要删除的公告ID * @return 结果 */ + @Override public int deleteNoticeByIds(Long[] noticeIds) { return noticeMapper.deleteNoticeByIds(noticeIds); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java index e60dc0684..b013cbb2e 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java @@ -66,6 +66,7 @@ public class SysPostServiceImpl implements ISysPostService * @param userId 用户ID * @return 选中岗位ID列表 */ + @Override public List selectPostListByUserId(Long userId) { return postMapper.selectPostListByUserId(userId); @@ -138,6 +139,7 @@ public class SysPostServiceImpl implements ISysPostService * @return 结果 * @throws Exception 异常 */ + @Override public int deletePostByIds(Long[] postIds) { for (Long postId : postIds) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java index 077d1ac92..71f3c6684 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java @@ -81,6 +81,7 @@ public class SysRoleServiceImpl implements ISysRoleService * * @return 角色列表 */ + @Override public List selectRoleAll() { return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); @@ -92,6 +93,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param userId 用户ID * @return 选中角色ID列表 */ + @Override public List selectRoleListByUserId(Long userId) { return roleMapper.selectRoleListByUserId(userId); @@ -103,6 +105,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param roleId 角色ID * @return 角色对象信息 */ + @Override public SysRole selectRoleById(Long roleId) { return roleMapper.selectRoleById(roleId); @@ -149,6 +152,7 @@ public class SysRoleServiceImpl implements ISysRoleService * * @param role 角色信息 */ + @Override public void checkRoleAllowed(SysRole role) { if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) @@ -207,6 +211,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param role 角色信息 * @return 结果 */ + @Override public int updateRoleStatus(SysRole role) { return roleMapper.updateRole(role); @@ -296,6 +301,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param roleIds 需要删除的角色ID * @return 结果 */ + @Override public int deleteRoleByIds(Long[] roleIds) { for (Long roleId : roleIds) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java index 756b20ef2..fb45b8017 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java @@ -72,6 +72,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService * @param user 用户信息 * @return 在线用户 */ + @Override public SysUserOnline loginUserToUserOnline(LoginUser user) { if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser())) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java index 77affcb80..28788e4df 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java @@ -192,6 +192,7 @@ public class SysUserServiceImpl implements ISysUserService * * @param user 用户信息 */ + @Override public void checkUserAllowed(SysUser user) { if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) @@ -268,10 +269,11 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户头像 * - * @param userId 用户ID + * @param userName 用户名 * @param avatar 头像地址 * @return 结果 */ + @Override public boolean updateUserAvatar(String userName, String avatar) { return userMapper.updateUserAvatar(userName, avatar) > 0; @@ -376,6 +378,7 @@ public class SysUserServiceImpl implements ISysUserService * @param userIds 需要删除的用户ID * @return 结果 */ + @Override public int deleteUserByIds(Long[] userIds) { for (Long userId : userIds) diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java index c9fda50dd..bd551ada9 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java @@ -80,6 +80,7 @@ public class GenTableServiceImpl implements IGenTableService * @param genTable 业务信息 * @return 数据库表集合 */ + @Override public List selectDbTableList(GenTable genTable) { return genTableMapper.selectDbTableList(genTable); @@ -91,6 +92,7 @@ public class GenTableServiceImpl implements IGenTableService * @param tableNames 表名称组 * @return 数据库表集合 */ + @Override public List selectDbTableListByNames(String[] tableNames) { return genTableMapper.selectDbTableListByNames(tableNames); @@ -121,7 +123,7 @@ public class GenTableServiceImpl implements IGenTableService /** * 删除业务对象 * - * @param ids 需要删除的数据ID + * @param tableIds 需要删除的数据ID * @return 结果 */ @Override @@ -173,6 +175,7 @@ public class GenTableServiceImpl implements IGenTableService * @param tableId 表编号 * @return 预览数据列表 */ + @Override public Map previewCode(Long tableId) { Map dataMap = new LinkedHashMap<>(); @@ -277,6 +280,7 @@ public class GenTableServiceImpl implements IGenTableService * * @param genTable 业务信息 */ + @Override public void validateEdit(GenTable genTable) { if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) @@ -301,7 +305,7 @@ public class GenTableServiceImpl implements IGenTableService /** * 设置主键列信息 * - * @param genTable 业务表信息 + * @param table 业务表信息 * @param columns 业务字段列表 */ public void setPkColumn(GenTable table, List columns) From 5bd2838b2b99e45c6cb0cba377395e941ea0de2f Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 19 Jun 2020 18:22:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=B8=8E=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/project/system/controller/SysLoginController.java | 5 +---- .../project/tool/gen/service/GenTableColumnServiceImpl.java | 2 +- .../project/tool/gen/service/IGenTableColumnService.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java index 6871d836a..df8231781 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java @@ -42,10 +42,7 @@ public class SysLoginController /** * 登录方法 * - * @param username 用户名 - * @param password 密码 - * @param captcha 验证码 - * @param uuid 唯一标识 + * @param loginBody 登陆信息 * @return 结果 */ @PostMapping("/login") diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java index 38c6359f4..61ae55e3a 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java @@ -21,7 +21,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService /** * 查询业务字段列表 * - * @param genTableColumn 业务字段编号 + * @param tableId 业务字段编号 * @return 业务字段集合 */ @Override diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java index d74c3e7c3..a2c7fc288 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java @@ -13,7 +13,7 @@ public interface IGenTableColumnService /** * 查询业务字段列表 * - * @param genTableColumn 业务字段编号 + * @param tableId 业务字段编号 * @return 业务字段集合 */ public List selectGenTableColumnListByTableId(Long tableId);