Commit 9d47a4c6 by RuoYi

遗漏注释补充

parent 6dc56c6e
......@@ -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>
......
......@@ -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;
......
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)
{
......
......@@ -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;
/**
......@@ -337,17 +332,6 @@ public class ShiroConfig
}
/**
* 开启Shiro代理
*/
@Bean
public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator()
{
DefaultAdvisorAutoProxyCreator proxyCreator = new DefaultAdvisorAutoProxyCreator();
proxyCreator.setProxyTargetClass(true);
return proxyCreator;
}
/**
* thymeleaf模板引擎和shiro框架的整合
*/
@Bean
......
......@@ -29,6 +29,7 @@ public interface DeptMapper
/**
* 查询部门管理数据
*
* @param dept 部门信息
* @return 部门信息集合
*/
public List<Dept> selectDeptList(Dept dept);
......
......@@ -15,6 +15,7 @@ public interface IDeptService
/**
* 查询部门管理数据
*
* @param dept 部门信息
* @return 部门信息集合
*/
public List<Dept> selectDeptList(Dept dept);
......
......@@ -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);
......
......@@ -46,6 +46,7 @@ public interface IDictTypeService
*
* @param ids 需要删除的数据
* @return 结果
* @throws Exception 异常
*/
public int deleteDictTypeByIds(String ids) throws Exception;
......
......@@ -34,10 +34,11 @@ public interface MenuMapper
* @return 菜单列表
*/
public List<String> selectMenuTree(Long roleId);
/**
* 查询系统菜单列表
*
* @param menu 菜单信息
* @return 菜单列表
*/
public List<Menu> selectMenuList(Menu menu);
......@@ -64,7 +65,7 @@ public interface MenuMapper
* @return 菜单信息
*/
public Menu selectMenuById(Long menuId);
/**
* 查询菜单数量
*
......@@ -80,7 +81,7 @@ public interface MenuMapper
* @return 结果
*/
public int insertMenu(Menu menu);
/**
* 修改菜单信息
*
......@@ -88,7 +89,7 @@ public interface MenuMapper
* @return 结果
*/
public int updateMenu(Menu menu);
/**
* 校验菜单名称是否唯一
*
......
......@@ -26,6 +26,7 @@ public interface IMenuService
/**
* 查询系统菜单列表
*
* @param menu 菜单信息
* @return 菜单列表
*/
public List<Menu> selectMenuList(Menu menu);
......
......@@ -45,6 +45,8 @@ public interface IPostService
* 批量删除岗位信息
*
* @param ids 需要删除的数据ID
* @return 结果
* @throws Exception 异常
*/
public int deletePostByIds(String ids) throws Exception;
......
......@@ -63,6 +63,8 @@ public interface IRoleService
* 批量删除角色用户信息
*
* @param ids 需要删除的数据ID
* @return 结果
* @throws Exception 异常
*/
public int deleteRoleByIds(String ids) throws Exception;
......
......@@ -63,6 +63,8 @@ public interface IUserService
* 批量删除用户信息
*
* @param ids 需要删除的数据ID
* @return 结果
* @throws Exception 异常
*/
public int deleteUserByIds(String ids) throws Exception;
......
......@@ -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))
{
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment