遗漏注释补充

README.md

@@ -60,10 +60,6 @@ http://webapplayers.com/inspinia_admin-v2.7.1
         <td><img src="https://static.oschina.net/uploads/space/2018/0728/115151_EuYC_1438828.png"/></td>
         <td><img src="https://static.oschina.net/uploads/space/2018/0728/115212_QybT_1438828.png"/></td>
     </tr>
-	<tr>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0727/172807_8stz_1438828.jpg"/></td>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0727/172830_Q20u_1438828.jpg"/></td>
-    </tr>
 </table>
 
 

src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -16,16 +16,24 @@ import com.ruoyi.framework.config.RuoYiConfig;
 public class FileUploadUtils
 {
 
-    // 默认大小 50M
+    /**
+     * 默认大小 50M
+     */
     public static final long DEFAULT_MAX_SIZE = 52428800;
 
-    // 默认上传的地址
+    /**
+     * 默认上传的地址
+     */
     private static String defaultBaseDir = RuoYiConfig.getProfile();
 
-    // 默认的文件名最大长度
+    /**
+     * 默认的文件名最大长度
+     */
     public static final int DEFAULT_FILE_NAME_LENGTH = 200;
 
-    // 默认文件类型jpg
+    /**
+     * 默认文件类型jpg
+     */
     public static final String IMAGE_JPG_EXTENSION = ".jpg";
 
     private static int counter = 0;

src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

@@ -1,7 +1,6 @@
 package com.ruoyi.common.utils.http;
 
 import java.io.BufferedReader;
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -165,7 +164,6 @@ public class HttpUtils
         return result.toString();
     }
 
-    @SuppressWarnings("deprecation")
     public static String sendSSLPost(String url, String param)
     {
         StringBuilder result = new StringBuilder();
@@ -189,11 +187,10 @@ public class HttpUtils
             conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
             conn.connect();
             InputStream is = conn.getInputStream();
-            DataInputStream indata = new DataInputStream(is);
+            BufferedReader br = new BufferedReader(new InputStreamReader(is));
             String ret = "";
-            while (ret != null)
+            while ((ret = br.readLine()) != null)
             {
-                ret = indata.readLine();
                 if (ret != null && !ret.trim().equals(""))
                 {
                     result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
@@ -201,7 +198,7 @@ public class HttpUtils
             }
             log.info("recv - {}", result);
             conn.disconnect();
-            indata.close();
+            br.close();
         }
         catch (ConnectException e)
         {

src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -31,6 +31,8 @@ import org.apache.poi.ss.util.CellRangeAddressList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.ResourceUtils;
+
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.shiro.web.session.OnlineWebSessionManager;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -58,28 +60,32 @@ public class ExcelUtil<T>
 
         Workbook workbook = WorkbookFactory.create(input);
         Sheet sheet = workbook.getSheet(sheetName);
-        if (!sheetName.trim().equals(""))
+        if (StringUtils.isNotEmpty(sheetName))
         {
-            sheet = workbook.getSheet(sheetName); // 如果指定sheet名,则取指定sheet中的内容.
+            // 如果指定sheet名,则取指定sheet中的内容.
+            sheet = workbook.getSheet(sheetName);
         }
         if (sheet == null)
         {
-            sheet = workbook.getSheetAt(0); // 如果传入的sheet名不存在则默认指向第1个sheet.
+            // 如果传入的sheet名不存在则默认指向第1个sheet.
+            sheet = workbook.getSheetAt(0);
         }
         int rows = sheet.getPhysicalNumberOfRows();
 
         if (rows > 0)
         {
-            // 有数据时才处理
-            Field[] allFields = clazz.getDeclaredFields(); // 得到类的所有field.
-            Map<Integer, Field> fieldsMap = new HashMap<Integer, Field>(); // 定义一个map用于存放列的序号和field.
+            // 有数据时才处理 得到类的所有field.
+            Field[] allFields = clazz.getDeclaredFields();
+            // 定义一个map用于存放列的序号和field.
+            Map<Integer, Field> fieldsMap = new HashMap<Integer, Field>();
             for (int col = 0; col < allFields.length; col++)
             {
                 Field field = allFields[col];
                 // 将有注解的field存放到map中.
                 if (field.isAnnotationPresent(Excel.class))
                 {
-                    field.setAccessible(true);// 设置类的私有字段属性可访问.
+                    // 设置类的私有字段属性可访问.
+                    field.setAccessible(true);
                     fieldsMap.put(col, field);
                 }
             }
@@ -104,13 +110,15 @@ public class ExcelUtil<T>
                     }
 
                     String c = cell.getStringCellValue();
-                    if (c.equals(""))
+                    if (StringUtils.isEmpty(c))
                     {
                         continue;
                     }
 
-                    entity = (entity == null ? clazz.newInstance() : entity);// 如果不存在实例则新建.
-                    Field field = fieldsMap.get(j);// 从map中得到对应列的field.
+                    // 如果不存在实例则新建.
+                    entity = (entity == null ? clazz.newInstance() : entity);
+                    // 从map中得到对应列的field.
+                    Field field = fieldsMap.get(j);
                     // 取得类型,并根据对象类型设置值.
                     Class<?> fieldType = field.getType();
                     if (String.class == fieldType)
@@ -179,7 +187,8 @@ public class ExcelUtil<T>
      */
     public AjaxResult exportExcel(List<T> list, String sheetName)
     {
-        Field[] allFields = clazz.getDeclaredFields();// 得到所有定义字段
+        // 得到所有定义字段
+        Field[] allFields = clazz.getDeclaredFields();
         List<Field> fields = new ArrayList<Field>();
         // 得到所有field并存放到一个list中.
         for (Field field : allFields)
@@ -190,32 +199,39 @@ public class ExcelUtil<T>
             }
         }
 
-        HSSFWorkbook workbook = new HSSFWorkbook();// 产生工作薄对象
+        // 产生工作薄对象
+        HSSFWorkbook workbook = new HSSFWorkbook();
         // excel2003中每个sheet中最多有65536行
         int sheetSize = 65536;
-        double sheetNo = Math.ceil(list.size() / sheetSize);// 取出一共有多少个sheet.
+        // 取出一共有多少个sheet.
+        double sheetNo = Math.ceil(list.size() / sheetSize);
         for (int index = 0; index <= sheetNo; index++)
         {
-            HSSFSheet sheet = workbook.createSheet();// 产生工作表对象
+            // 产生工作表对象
+            HSSFSheet sheet = workbook.createSheet();
             if (sheetNo == 0)
             {
                 workbook.setSheetName(index, sheetName);
             }
             else
             {
-                workbook.setSheetName(index, sheetName + index);// 设置工作表的名称.
+                // 设置工作表的名称.
+                workbook.setSheetName(index, sheetName + index);
             }
             HSSFRow row;
             HSSFCell cell; // 产生单元格
 
-            row = sheet.createRow(0); // 产生一行
+            // 产生一行
+            row = sheet.createRow(0);
             // 写入各个字段的列头名称
             for (int i = 0; i < fields.size(); i++)
             {
                 Field field = fields.get(i);
                 Excel attr = field.getAnnotation(Excel.class);
-                cell = row.createCell(i); // 创建列
-                cell.setCellType(HSSFCell.CELL_TYPE_STRING); // 设置列中写入内容为String类型
+                // 创建列
+                cell = row.createCell(i);
+                // 设置列中写入内容为String类型
+                cell.setCellType(HSSFCell.CELL_TYPE_STRING);
                 HSSFCellStyle cellStyle = workbook.createCellStyle();
                 cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
                 cellStyle.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
@@ -230,8 +246,10 @@ public class ExcelUtil<T>
                 else
                 {
                     HSSFFont font = workbook.createFont();
-                    font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); // 粗体显示
-                    cellStyle.setFont(font); // 选择需要用到的字体格式
+                    // 粗体显示
+                    font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+                    // 选择需要用到的字体格式
+                    cellStyle.setFont(font);
                     cellStyle.setFillForegroundColor(HSSFColor.LIGHT_YELLOW.index);
                     // 设置列宽
                     sheet.setColumnWidth(i, 3766);
@@ -240,17 +258,20 @@ public class ExcelUtil<T>
                 cellStyle.setWrapText(true);
                 cell.setCellStyle(cellStyle);
 
-                cell.setCellValue(attr.name());// 写入列名
+                // 写入列名
+                cell.setCellValue(attr.name());
 
                 // 如果设置了提示信息则鼠标放上去提示.
-                if (!attr.prompt().trim().equals(""))
+                if (StringUtils.isNotEmpty(attr.prompt()))
                 {
-                    setHSSFPrompt(sheet, "", attr.prompt(), 1, 100, i, i); // 这里默认设了2-101列提示.
+                    // 这里默认设了2-101列提示.
+                    setHSSFPrompt(sheet, "", attr.prompt(), 1, 100, i, i);
                 }
                 // 如果设置了combo属性则本列只能选择不能输入
                 if (attr.combo().length > 0)
                 {
-                    setHSSFValidation(sheet, attr.combo(), 1, 100, i, i); // 这里默认设了2-101列只能选择不能输入.
+                    // 这里默认设了2-101列只能选择不能输入.
+                    setHSSFValidation(sheet, attr.combo(), 1, 100, i, i);
                 }
             }
 
@@ -263,18 +284,22 @@ public class ExcelUtil<T>
             for (int i = startNo; i < endNo; i++)
             {
                 row = sheet.createRow(i + 1 - startNo);
-                T vo = (T) list.get(i); // 得到导出对象.
+                // 得到导出对象.
+                T vo = (T) list.get(i);
                 for (int j = 0; j < fields.size(); j++)
                 {
-                    Field field = fields.get(j); // 获得field.
-                    field.setAccessible(true); // 设置实体类私有属性可访问
+                    // 获得field.
+                    Field field = fields.get(j);
+                    // 设置实体类私有属性可访问
+                    field.setAccessible(true);
                     Excel attr = field.getAnnotation(Excel.class);
                     try
                     {
                         // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
                         if (attr.isExport())
                         {
-                            cell = row.createCell(j);// 创建cell
+                            // 创建cell
+                            cell = row.createCell(j);
                             cell.setCellStyle(cs);
                             try
                             {
@@ -292,11 +317,13 @@ public class ExcelUtil<T>
                                 cell.setCellType(HSSFCell.CELL_TYPE_STRING);
                                 if (vo == null)
                                 {
-                                    cell.setCellValue(""); // 如果数据存在就填入,不存在填入空格.
+                                    // 如果数据存在就填入,不存在填入空格.
+                                    cell.setCellValue("");
                                 }
                                 else
                                 {
-                                    cell.setCellValue(field.get(vo) == null ? "" : String.valueOf(field.get(vo)));// 如果数据存在就填入,不存在填入空格.
+                                    // 如果数据存在就填入,不存在填入空格.
+                                    cell.setCellValue(field.get(vo) == null ? "" : String.valueOf(field.get(vo)));
                                 }
 
                             }
@@ -362,9 +389,9 @@ public class ExcelUtil<T>
         // 四个参数分别是：起始行、终止行、起始列、终止列
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         // 数据有效性对象
-        HSSFDataValidation data_validation_view = new HSSFDataValidation(regions, constraint);
-        data_validation_view.createPromptBox(promptTitle, promptContent);
-        sheet.addValidationData(data_validation_view);
+        HSSFDataValidation dataValidationView = new HSSFDataValidation(regions, constraint);
+        dataValidationView.createPromptBox(promptTitle, promptContent);
+        sheet.addValidationData(dataValidationView);
         return sheet;
     }
 
@@ -387,8 +414,8 @@ public class ExcelUtil<T>
         // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         // 数据有效性对象
-        HSSFDataValidation data_validation_list = new HSSFDataValidation(regions, constraint);
-        sheet.addValidationData(data_validation_list);
+        HSSFDataValidation dataValidationList = new HSSFDataValidation(regions, constraint);
+        sheet.addValidationData(dataValidationList);
         return sheet;
     }
 

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

@@ -2,9 +2,7 @@ package com.ruoyi.framework.config;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.servlet.Filter;
-
 import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.apache.shiro.codec.Base64;
 import org.apache.shiro.mgt.SecurityManager;
@@ -13,12 +11,10 @@ import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.web.mgt.CookieRememberMeManager;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.servlet.SimpleCookie;
-import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.shiro.realm.UserRealm;
 import com.ruoyi.framework.shiro.session.OnlineSessionDAO;
@@ -29,7 +25,6 @@ import com.ruoyi.framework.shiro.web.filter.online.OnlineSessionFilter;
 import com.ruoyi.framework.shiro.web.filter.sync.SyncOnlineSessionFilter;
 import com.ruoyi.framework.shiro.web.session.OnlineWebSessionManager;
 import com.ruoyi.framework.shiro.web.session.SpringSessionValidationScheduler;
-
 import at.pollux.thymeleaf.shiro.dialect.ShiroDialect;
 
 /**
@@ -336,17 +331,6 @@ public class ShiroConfig
         return cookieRememberMeManager;
     }
 
-    /**
-     * 开启Shiro代理
-     */
-    @Bean
-    public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator()
-    {
-        DefaultAdvisorAutoProxyCreator proxyCreator = new DefaultAdvisorAutoProxyCreator();
-        proxyCreator.setProxyTargetClass(true);
-        return proxyCreator;
-    }
-
     /**
      * thymeleaf模板引擎和shiro框架的整合
      */

src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java

@@ -29,6 +29,7 @@ public interface DeptMapper
     /**
      * 查询部门管理数据
      * 
+     * @param dept 部门信息
      * @return 部门信息集合
      */
     public List<Dept> selectDeptList(Dept dept);

src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java

@@ -15,6 +15,7 @@ public interface IDeptService
     /**
      * 查询部门管理数据
      * 
+     * @param dept 部门信息
      * @return 部门信息集合
      */
     public List<Dept> selectDeptList(Dept dept);

src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java

@@ -50,6 +50,7 @@ public class DictDataServiceImpl implements IDictDataService
      * @param dictValue 字典键值
      * @return 字典标签
      */
+    @Override
     public String selectDictLabel(String dictType, String dictValue)
     {
         return dictDataMapper.selectDictLabel(dictType, dictValue);

src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java

@@ -46,6 +46,7 @@ public interface IDictTypeService
      * 
      * @param ids 需要删除的数据
      * @return 结果
+     * @throws Exception 异常
      */
     public int deleteDictTypeByIds(String ids) throws Exception;
 

src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java

@@ -38,6 +38,7 @@ public interface MenuMapper
     /**
      * 查询系统菜单列表
      * 
+     * @param menu 菜单信息
      * @return 菜单列表
      */
     public List<Menu> selectMenuList(Menu menu);

src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java

@@ -26,6 +26,7 @@ public interface IMenuService
     /**
      * 查询系统菜单列表
      * 
+     * @param menu 菜单信息
      * @return 菜单列表
      */
     public List<Menu> selectMenuList(Menu menu);

src/main/java/com/ruoyi/project/system/post/service/IPostService.java

@@ -45,6 +45,8 @@ public interface IPostService
      * 批量删除岗位信息
      * 
      * @param ids 需要删除的数据ID
+     * @return 结果
+     * @throws Exception 异常
      */
     public int deletePostByIds(String ids) throws Exception;
 

src/main/java/com/ruoyi/project/system/role/service/IRoleService.java

@@ -63,6 +63,8 @@ public interface IRoleService
      * 批量删除角色用户信息
      * 
      * @param ids 需要删除的数据ID
+     * @return 结果
+     * @throws Exception 异常
      */
     public int deleteRoleByIds(String ids) throws Exception;
 

src/main/java/com/ruoyi/project/system/user/service/IUserService.java

@@ -63,6 +63,8 @@ public interface IUserService
      * 批量删除用户信息
      * 
      * @param ids 需要删除的数据ID
+     * @return 结果
+     * @throws Exception 异常
      */
     public int deleteUserByIds(String ids) throws Exception;
 

src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java

@@ -19,13 +19,13 @@ import com.ruoyi.project.tool.gen.domain.TableInfo;
 public class GenUtils
 {
     /** 项目空间路径 */
-    private static final String projectPath = "main/java/com/ruoyi/project";
+    private static final String PROJECT_PATH = "main/java/com/ruoyi/project";
 
     /** mybatis空间路径 */
-    private static final String myBatisPath = "main/resources/mybatis";
+    private static final String MYBATIS_PATH = "main/resources/mybatis";
 
     /** html空间路径 */
-    private static final String templatesPath = "main/resources/templates";
+    private static final String TEMPLATES_PATH = "main/resources/templates";
 
     /**
      * 设置列信息
@@ -119,9 +119,9 @@ public class GenUtils
         String classname = table.getClassname();
         // 大写类名
         String className = table.getClassName();
-        String javaPath = projectPath + "/" + moduleName + "/";
-        String mybatisPath = myBatisPath + "/" + moduleName + "/" + className;
-        String htmlPath = templatesPath + "/" + moduleName + "/" + classname;
+        String javaPath = PROJECT_PATH + "/" + moduleName + "/";
+        String mybatisPath = MYBATIS_PATH + "/" + moduleName + "/" + className;
+        String htmlPath = TEMPLATES_PATH + "/" + moduleName + "/" + classname;
 
         if (StringUtils.isNotEmpty(classname))
         {

src/main/resources/mybatis/monitor/JobMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		where job_id = #{jobId}
 	</update>
  	
- 	<insert id="insertJob" parameterType="Post" useGeneratedKeys="true" keyProperty="jobId">
+ 	<insert id="insertJob" parameterType="Job" useGeneratedKeys="true" keyProperty="jobId">
  		insert into sys_job(
  			<if test="jobId != null and jobId != 0">job_id,</if>
  			<if test="jobName != null and jobName != ''">job_name,</if>