github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化代码

pull/207/MERGE
RuoYi 2020-09-30 15:57:06 +08:00
parent 80ff14f88f
commit 63f394b0e9
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/templates/main.html
View File

@ -1078,7 +1078,7 @@
type: 1, type: 1,
closeBtn:false, closeBtn:false,
shadeClose:true, shadeClose:true,
area: ['600px', 'auto'], area: ['600px', '360px'],
content: html content: html
}); });
}); });

9
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
View File

@ -84,12 +84,13 @@ public class AjaxResult extends HashMap<String, Object>
/** /**
* 方便链式调用 * 方便链式调用
* *
* @param key * @param key 键
* @param value * @param value 值
* @return * @return 数据对象
*/ */
@Override @Override
public AjaxResult put(String key, Object value) { public AjaxResult put(String key, Object value)
{
super.put(key, value); super.put(key, value);
return this; return this;
} }

9
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
View File

@ -131,13 +131,12 @@ public class FileUploadUtils
{ {
File desc = new File(uploadDir + File.separator + fileName); File desc = new File(uploadDir + File.separator + fileName);
if (!desc.getParentFile().exists())
{
desc.getParentFile().mkdirs();
}
if (!desc.exists()) if (!desc.exists())
{ {
desc.createNewFile(); if (!desc.getParentFile().exists())
{
desc.getParentFile().mkdirs();
}
} }
return desc; return desc;
} }

7
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
View File

@ -23,7 +23,6 @@ import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service; import ${packageName}.service.I${ClassName}Service;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.framework.util.ShiroUtils;
/** /**
* ${functionName}Service业务层处理 * ${functionName}Service业务层处理
@ -77,9 +76,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
#if($column.javaField == 'createTime') #if($column.javaField == 'createTime')
${className}.setCreateTime(DateUtils.getNowDate()); ${className}.setCreateTime(DateUtils.getNowDate());
#end #end
#if($column.javaField == 'createBy')
${className}.setCreateBy(ShiroUtils.getLoginName());
#end
#end #end
#if($table.sub) #if($table.sub)
int rows = ${className}Mapper.insert${ClassName}(${className}); int rows = ${className}Mapper.insert${ClassName}(${className});
@ -106,9 +102,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
#if($column.javaField == 'updateTime') #if($column.javaField == 'updateTime')
${className}.setUpdateTime(DateUtils.getNowDate()); ${className}.setUpdateTime(DateUtils.getNowDate());
#end #end
#if($column.javaField == 'updateBy')
${className}.setUpdateBy(ShiroUtils.getLoginName());
#end
#end #end
#if($table.sub) #if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());