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

修复已知bug

pull/3/head
RuoYi 2018-05-16 21:20:06 +08:00
parent f85ab94422
commit cc27d85b1a
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ public class GenUtils
if (template.contains("Mapper.java.vm")) if (template.contains("Mapper.java.vm"))
{ {
return javaPath + "mapper" + "/" + "I" + className + "Mapper.java"; return javaPath + "mapper" + "/" + className + "Mapper.java";
} }
if (template.contains("Service.java.vm")) if (template.contains("Service.java.vm"))

2
src/main/resources/static/ruoyi/login.js
View File

@ -17,7 +17,7 @@ $.validator.setDefaults({
function login() { function login() {
var username = $("input[name='username']").val().trim(); var username = $("input[name='username']").val().trim();
var password = $("input[name='password']").val().trim(); var password = $("input[name='password']").val().trim();
var validateCode = $("input[name='validateCode']").val().trim(); var validateCode = $("input[name='validateCode']").val();
var rememberMe = $("input[name='rememberme']").is(':checked'); var rememberMe = $("input[name='rememberme']").is(':checked');
$.ajax({ $.ajax({
type: "POST", type: "POST",

3
src/main/resources/templates/system/user/profile/avatar.html
View File

@ -4,6 +4,7 @@
<title>用户头像修改</title> <title>用户头像修改</title>
<link href="/ajax/libs/cropbox/cropbox.css" th:href="@{/ajax/libs/cropbox/cropbox.css}" rel="stylesheet"/> <link href="/ajax/libs/cropbox/cropbox.css" th:href="@{/ajax/libs/cropbox/cropbox.css}" rel="stylesheet"/>
<body class="white-bg"> <body class="white-bg">
<input name="userId" id="userId" type="hidden" th:value="${user.userId}" />
<div class="container"> <div class="container">
<div class="imageBox"> <div class="imageBox">
<div class="thumbBox"></div> <div class="thumbBox"></div>
@ -44,7 +45,7 @@ $(window).load(function() {
var img = cropper.getBlob(); var img = cropper.getBlob();
var formdata = new FormData(); var formdata = new FormData();
formdata.append("avatarfile", img); formdata.append("avatarfile", img);
formdata.append("userId", 1); formdata.append("userId", $("#userId").val());
$.ajax({ $.ajax({
url: ctx + "system/user/profile/updateAvatar", url: ctx + "system/user/profile/updateAvatar",
data: formdata, data: formdata,

2
src/main/resources/templates/vm/java/Controller.java.vm
View File

@ -34,7 +34,7 @@ public class ${className}Controller extends BaseController
@GetMapping() @GetMapping()
@RequiresPermissions("${moduleName}:${classname}:view") @RequiresPermissions("${moduleName}:${classname}:view")
String ${classname}() public String ${classname}()
{ {
return prefix + "/${classname}"; return prefix + "/${classname}";
} }

2
src/main/resources/templates/vm/java/Mapper.java.vm
View File

@ -9,7 +9,7 @@ import java.util.List;
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
public interface I${className}Mapper public interface ${className}Mapper
{ {
/** /**

4
src/main/resources/templates/vm/java/ServiceImpl.java.vm
View File

@ -4,7 +4,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import ${package}.mapper.I${className}Mapper; import ${package}.mapper.${className}Mapper;
import ${package}.domain.${className}; import ${package}.domain.${className};
import ${package}.service.I${className}Service; import ${package}.service.I${className}Service;
@ -18,7 +18,7 @@ import ${package}.service.I${className}Service;
public class ${className}ServiceImpl implements I${className}Service public class ${className}ServiceImpl implements I${className}Service
{ {
@Autowired @Autowired
private I${className}Mapper ${classname}Mapper; private ${className}Mapper ${classname}Mapper;
/** /**
* 查询${tableComment}信息 * 查询${tableComment}信息

2
src/main/resources/templates/vm/xml/Mapper.xml.vm
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${package}.mapper.I${className}Mapper"> <mapper namespace="${package}.mapper.${className}Mapper">
<resultMap type="${className}" id="${className}Result"> <resultMap type="${className}" id="${className}Result">
#foreach ($column in $columns) #foreach ($column in $columns)