|
|
|
@ -41,7 +41,7 @@ public class User_service {
|
|
|
|
return "密码长6-20位,至少包含大小写字母和数字";
|
|
|
|
return "密码长6-20位,至少包含大小写字母和数字";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
User new_one=new User(email);
|
|
|
|
User new_one=new User(email);
|
|
|
|
new_one.set_password(pwd);
|
|
|
|
new_one.set_password(User.hash_pwd(pwd));
|
|
|
|
new_one.set_id(id);
|
|
|
|
new_one.set_id(id);
|
|
|
|
if (find_user_i(id)!=null){
|
|
|
|
if (find_user_i(id)!=null){
|
|
|
|
return "用户名重复";
|
|
|
|
return "用户名重复";
|
|
|
|
@ -63,7 +63,7 @@ public class User_service {
|
|
|
|
if (u==null){
|
|
|
|
if (u==null){
|
|
|
|
return "请先注册";
|
|
|
|
return "请先注册";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (u.get_password().equals(pwd)){
|
|
|
|
if (User.check_hash_pwd(pwd,u.get_password())){
|
|
|
|
return "登陆成功";
|
|
|
|
return "登陆成功";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return "密码有误";
|
|
|
|
return "密码有误";
|
|
|
|
@ -74,7 +74,7 @@ public class User_service {
|
|
|
|
if (user == null) {
|
|
|
|
if (user == null) {
|
|
|
|
return "用户不存在";
|
|
|
|
return "用户不存在";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!user.get_password().equals(oldPassword)) {
|
|
|
|
if (!User.check_hash_pwd(oldPassword,user.get_password())) {
|
|
|
|
return "原密码不正确";
|
|
|
|
return "原密码不正确";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (oldPassword.equals(newPassword)){
|
|
|
|
if (oldPassword.equals(newPassword)){
|
|
|
|
|