给密码加点盐

houko · houko · commit e47cc047708e · 2016-04-29T14:07:46.000+08:00
diff --git a/core/src/main/java/info/xiaomo/core/model/UserModel.java b/core/src/main/java/info/xiaomo/core/model/UserModel.java
@@ -52,6 +52,7 @@ public String getNickName() {
         return nickName;
     }
 
+
     public void setNickName(String nickName) {
         this.nickName = nickName;
     }
diff --git a/core/src/main/java/info/xiaomo/core/untils/RandomUtil.java b/core/src/main/java/info/xiaomo/core/untils/RandomUtil.java
@@ -130,7 +130,7 @@ public static String createSalt() {
         String text = "";
         Random random = new Random();
         //随机产生4个字符的字符串
-        for (int i = 0; i < 4; i++) {
+        for (int i = 0; i < 10; i++) {
             text += str[random.nextInt(number)];
         }
         return text;
diff --git a/web/src/main/java/info/xiaomo/web/controller/UserController.java b/web/src/main/java/info/xiaomo/web/controller/UserController.java
@@ -221,7 +221,7 @@ public HashMap<String, Object> validateEmail(
         userModel.setEmail(email);
         userModel.setGender(GenderType.secret);
         userModel.setImgUrl(WebDefaultValueConst.defaultImage);//默认是个百度的LOGO，作测试用
-        userModel.setValidateCode(MD5Util.encode(email, ""));
+        userModel.setValidateCode(MD5Util.encode(email, salt));
         userModel.setPhone(0L);
         userModel.setAddress("");
         userModel.setPassword(MD5Util.encode(password, salt));
diff --git a/web/src/test/java/info/xiaomo/admin/test/UserTest/UserControllerTest.java b/web/src/test/java/info/xiaomo/admin/test/UserTest/UserControllerTest.java
@@ -9,6 +9,7 @@
 import info.xiaomo.core.service.UserService;
 import info.xiaomo.core.untils.DateUtil;
 import info.xiaomo.core.untils.MD5Util;
+import info.xiaomo.core.untils.RandomUtil;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -45,17 +46,35 @@ public class UserControllerTest extends BaseTest {
 
     @Test
     public void testRegister() {
+        String salt = RandomUtil.createSalt();
         UserModel userModel = new UserModel();
         userModel.setEmail("hupengbest@163.com");
+        userModel.setSalt(salt);
+        userModel.setNickName("xiaomo");
+        userModel.setPassword(MD5Util.encode("xiaomo", salt));
         userModel.setImgUrl(WebDefaultValueConst.defaultImage);
-        userModel.setValidateCode(MD5Util.encode(userModel.getEmail(), ""));
+        userModel.setValidateCode(MD5Util.encode(userModel.getEmail(), salt));
         userModel.setAddress("万轮科技园");
         userModel.setPhone(15172299114L);
         userModel.setGender(1);
         userModel = service.addUser(userModel);
         System.out.println(JSONObject.toJSON(userModel));
     }
 
+    @Test
+    public void testSalt(){
+        // xiaomox8ofli4fbc
+        String result = "61f3ba3daa18245941f5cce745282fc8";
+        String encode = MD5Util.encode("xiaomo","bxp8xnolif");
+        if (result.equals(encode)){
+            System.out.println(true);
+        } else{
+            System.out.println(result);
+            System.out.println(encode);
+            System.out.println(false);
+        }
+    }
+
 
     @Test
     public void testFindAll() {

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ public String getNickName() {`
`52`	`52`	`return nickName;`
`53`	`53`	`}`
`54`	`54`
	`55`	`+`
`55`	`56`	`public void setNickName(String nickName) {`
`56`	`57`	`this.nickName = nickName;`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public static String createSalt() {`
`130`	`130`	`String text = "";`
`131`	`131`	`Random random = new Random();`
`132`	`132`	`//随机产生4个字符的字符串`
`133`		`- for (int i = 0; i < 4; i++) {`
	`133`	`+ for (int i = 0; i < 10; i++) {`
`134`	`134`	`text += str[random.nextInt(number)];`
`135`	`135`	`}`
`136`	`136`	`return text;`