diff --git a/README.md b/README.md
index 2a108d8b..10199b08 100644
--- a/README.md
+++ b/README.md
@@ -60,10 +60,6 @@ http://webapplayers.com/inspinia_admin-v2.7.1
 |
 |
-
-  |
-  |
-
diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 523873ba..3e7ab474 100644
--- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/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;
diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 2eef157f..97e285df 100644
--- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/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)
{
diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 607428d3..07aab332 100644
--- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/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
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 fieldsMap = new HashMap(); // 定义一个map用于存放列的序号和field.
+ // 有数据时才处理 得到类的所有field.
+ Field[] allFields = clazz.getDeclaredFields();
+ // 定义一个map用于存放列的序号和field.
+ Map fieldsMap = new HashMap();
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
}
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
*/
public AjaxResult exportExcel(List list, String sheetName)
{
- Field[] allFields = clazz.getDeclaredFields();// 得到所有定义字段
+ // 得到所有定义字段
+ Field[] allFields = clazz.getDeclaredFields();
List fields = new ArrayList();
// 得到所有field并存放到一个list中.
for (Field field : allFields)
@@ -190,32 +199,39 @@ public class ExcelUtil
}
}
- 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
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
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
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
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)));
}
}
@@ -329,18 +356,18 @@ public class ExcelUtil
*
* @param col
*/
-// public static int getExcelCol(String col)
-// {
-// col = col.toUpperCase();
-// // 从-1开始计算,字母重1开始运算。这种总数下来算数正好相同。
-// int count = -1;
-// char[] cs = col.toCharArray();
-// for (int i = 0; i < cs.length; i++)
-// {
-// count += (cs[i] - 64) * Math.pow(26, cs.length - 1 - i);
-// }
-// return count;
-// }
+ // public static int getExcelCol(String col)
+ // {
+ // col = col.toUpperCase();
+ // // 从-1开始计算,字母重1开始运算。这种总数下来算数正好相同。
+ // int count = -1;
+ // char[] cs = col.toCharArray();
+ // for (int i = 0; i < cs.length; i++)
+ // {
+ // count += (cs[i] - 64) * Math.pow(26, cs.length - 1 - i);
+ // }
+ // return count;
+ // }
/**
* 设置单元格上提示
@@ -362,9 +389,9 @@ public class ExcelUtil
// 四个参数分别是：起始行、终止行、起始列、终止列
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
// 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
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;
}
diff --git a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index 6b27a366..58b37c3c 100644
--- a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/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框架的整合
*/
diff --git a/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java b/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
index 8eba3140..ea76f3fe 100644
--- a/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
+++ b/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
@@ -29,6 +29,7 @@ public interface DeptMapper
/**
* 查询部门管理数据
*
+ * @param dept 部门信息
* @return 部门信息集合
*/
public List selectDeptList(Dept dept);
diff --git a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
index b42d437d..9354e852 100644
--- a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
+++ b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
@@ -15,6 +15,7 @@ public interface IDeptService
/**
* 查询部门管理数据
*
+ * @param dept 部门信息
* @return 部门信息集合
*/
public List selectDeptList(Dept dept);
diff --git a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
index c93f4e94..1265c45e 100644
--- a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
+++ b/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);
diff --git a/src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java b/src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java
index cd814d69..b37b7d42 100644
--- a/src/main/java/com/ruoyi/project/system/dict/service/IDictTypeService.java
+++ b/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;
diff --git a/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java b/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java
index 0f27bafd..5e674025 100644
--- a/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java
+++ b/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java
@@ -34,10 +34,11 @@ public interface MenuMapper
* @return 菜单列表
*/
public List selectMenuTree(Long roleId);
-
+
/**
* 查询系统菜单列表
*
+ * @param menu 菜单信息
* @return 菜单列表
*/
public List