7 năm trước cách đây · cc27d85b1a
--- a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
@@ -142,7 +142,7 @@ public class GenUtils
 
				 
			
 
				         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"))
			
--- a/src/main/resources/static/ruoyi/login.js
+++ b/src/main/resources/static/ruoyi/login.js
@@ -17,7 +17,7 @@ $.validator.setDefaults({
 
				 function login() {
			
 
				 	var username = $("input[name='username']").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');
			
 
				     $.ajax({
			
 
				         type: "POST",
			
--- a/src/main/resources/templates/system/user/profile/avatar.html
+++ b/src/main/resources/templates/system/user/profile/avatar.html
@@ -4,6 +4,7 @@
 
				 <title>用户头像修改</title>
			
 
				 <link href="/ajax/libs/cropbox/cropbox.css" th:href="@{/ajax/libs/cropbox/cropbox.css}" rel="stylesheet"/>
			
 
				 <body class="white-bg">
			
 
				+    <input name="userId" id="userId" type="hidden"  th:value="${user.userId}" />
			
 
				     <div class="container"> 
			
 
				         <div class="imageBox"> 
			
 
				 	        <div class="thumbBox"></div> 
			
@@ -44,7 +45,7 @@ $(window).load(function() {
 
				         var img = cropper.getBlob();
			
 
				         var formdata = new FormData();
			
 
				         formdata.append("avatarfile", img);
			
 
				-        formdata.append("userId", 1);
			
 
				+        formdata.append("userId", $("#userId").val());
			
 
				         $.ajax({
			
 
				             url: ctx + "system/user/profile/updateAvatar",
			
 
				             data: formdata,
			
--- a/src/main/resources/templates/vm/java/Controller.java.vm
+++ b/src/main/resources/templates/vm/java/Controller.java.vm
@@ -34,7 +34,7 @@ public class ${className}Controller extends BaseController
 
				 	
			
 
				 	@GetMapping()
			
 
				 	@RequiresPermissions("${moduleName}:${classname}:view")
			
 
				-	String ${classname}()
			
 
				+	public String ${classname}()
			
 
				 	{
			
 
				 	    return prefix + "/${classname}";
			
 
				 	}
			
--- a/src/main/resources/templates/vm/java/Mapper.java.vm
+++ b/src/main/resources/templates/vm/java/Mapper.java.vm
@@ -9,7 +9,7 @@ import java.util.List;
 
				  * @author ${author}
			
 
				  * @date ${datetime}
			
 
				  */
			
 
				-public interface I${className}Mapper 
			
 
				+public interface ${className}Mapper 
			
 
				 {
			
 
				 
			
 
				 	/**
			
--- a/src/main/resources/templates/vm/java/ServiceImpl.java.vm
+++ b/src/main/resources/templates/vm/java/ServiceImpl.java.vm
@@ -4,7 +4,7 @@ import java.util.List;
 
				 import org.springframework.beans.factory.annotation.Autowired;
			
 
				 import org.springframework.stereotype.Service;
			
 
				 import com.ruoyi.common.utils.StringUtils;
			
 
				-import ${package}.mapper.I${className}Mapper;
			
 
				+import ${package}.mapper.${className}Mapper;
			
 
				 import ${package}.domain.${className};
			
 
				 import ${package}.service.I${className}Service;
			
 
				 
			
@@ -18,7 +18,7 @@ import ${package}.service.I${className}Service;
 
				 public class ${className}ServiceImpl implements I${className}Service 
			
 
				 {
			
 
				 	@Autowired
			
 
				-	private I${className}Mapper ${classname}Mapper;
			
 
				+	private ${className}Mapper ${classname}Mapper;
			
 
				 	
			
 
				 	/**
			
 
				      * 查询${tableComment}信息
			
--- a/src/main/resources/templates/vm/xml/Mapper.xml.vm
+++ b/src/main/resources/templates/vm/xml/Mapper.xml.vm
@@ -2,7 +2,7 @@
 
				 <!DOCTYPE mapper
			
 
				 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			
 
				 "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">
			
 
				         #foreach ($column in $columns)