Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:

	ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java

	ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java

	ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java

	ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

	ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java

	ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java

ruoyi-ui/src/views/monitor/job/log.vue

@@ -196,9 +196,7 @@ export default {
         jobName: undefined,
         jobGroup: undefined,
         status: undefined
-      },
-      // 表单参数
-      form: {}
+      }
     };
   },
   created() {

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
 {
     /**
      * 操作成功

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";
 

ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java

@@ -376,6 +376,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return UUID 的哈希码值。
      */
+    @Override
     public int hashCode()
     {
         long hilo = mostSigBits ^ leastSigBits;
@@ -391,6 +392,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @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<UUID>
      * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
      *
      */
+    @Override
     public int compareTo(UUID val)
     {
         // The ordering is intentionally set up so that the UUIDs

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);

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;

ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java

@@ -36,6 +36,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
         this.clazz = clazz;
     }
 
+    @Override
     public byte[] serialize(T t) throws SerializationException
     {
         if (t == null)
@@ -45,6 +46,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
         return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
     }
 
+    @Override
     public T deserialize(byte[] bytes) throws SerializationException
     {
         if (bytes == null || bytes.length <= 0)

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);

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")

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())

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<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
@@ -173,7 +174,7 @@ public class SysConfigServiceImpl implements ISysConfigService
 
     /**
      * 设置cache key
-     *
+     * 
      * @param configKey 参数键
      * @return 缓存键key
      */

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);

ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java

@@ -68,7 +68,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 根据字典类型查询字典数据
-     *
+     * 
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
@@ -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();

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<Integer> selectMenuListByRoleId(Long roleId)
     {
         return menuMapper.selectMenuListByRoleId(roleId);
@@ -301,7 +302,7 @@ public class SysMenuServiceImpl implements ISysMenuService
 
     /**
      * 获取路由名称
-     *
+     * 
      * @param menu 菜单信息
      * @return 路由名称
      */

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);

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<Integer> 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)

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<SysRole> 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<Integer> 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)

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()))

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)

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

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<GenTable> selectDbTableList(GenTable genTable)
     {
         return genTableMapper.selectDbTableList(genTable);
@@ -91,6 +92,7 @@ public class GenTableServiceImpl implements IGenTableService
      * @param tableNames 表名称组
      * @return 数据库表集合
      */
+    @Override
     public List<GenTable> 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<String, String> previewCode(Long tableId)
     {
         Map<String, String> 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<GenTableColumn> columns)

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<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);