|
|
@@ -77,7 +77,7 @@ public class ThirdUserloginService {
|
|
|
else
|
|
|
{
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
|
|
|
- throw new ServiceException(e.getMessage());
|
|
|
+ throw new ServiceException(toEn(e.getMessage()));
|
|
|
}
|
|
|
}
|
|
|
finally
|
|
|
@@ -91,6 +91,12 @@ public class ThirdUserloginService {
|
|
|
return tokenService.createToken(loginUser);
|
|
|
}
|
|
|
|
|
|
+ private String toEn(String msg){
|
|
|
+ if("用户不存在/密码错误".equals(msg)){
|
|
|
+ return "User does not exist/Incorrect password.";
|
|
|
+ }
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
|
|
|
public String mailRegister(String username,String password){
|
|
|
SysUser user = new SysUser();
|
|
|
@@ -101,25 +107,25 @@ public class ThirdUserloginService {
|
|
|
|
|
|
if (StringUtils.isEmpty(username))
|
|
|
{
|
|
|
- msg = "用户名不能为空";
|
|
|
+ msg = "Username cannot be empty.";
|
|
|
}
|
|
|
else if (StringUtils.isEmpty(password))
|
|
|
{
|
|
|
- msg = "用户密码不能为空";
|
|
|
+ msg = "User password cannot be empty.";
|
|
|
}
|
|
|
else if (!StringUtils.isMail(username))
|
|
|
{
|
|
|
- msg = "账户名必须是邮箱格式";
|
|
|
+ msg = "The account name must be in email format.";
|
|
|
}
|
|
|
|
|
|
else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|
|
|
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH)
|
|
|
{
|
|
|
- msg = "密码长度必须在5到20个字符之间";
|
|
|
+ msg = "The password length must be between 5 and 20 characters.";
|
|
|
}
|
|
|
else if (!userService.checkUserNameUnique(sysUser))
|
|
|
{
|
|
|
- msg = "注册账号已存在";
|
|
|
+ msg = "The registered account already exists.";
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -130,7 +136,7 @@ public class ThirdUserloginService {
|
|
|
boolean regFlag = userService.registerUser(sysUser);
|
|
|
if (!regFlag)
|
|
|
{
|
|
|
- msg = "注册失败,请稍后再试";
|
|
|
+ msg = "Registration failed, please try again later.";
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -139,4 +145,8 @@ public class ThirdUserloginService {
|
|
|
}
|
|
|
return msg;
|
|
|
}
|
|
|
+
|
|
|
+ public int deleteUser(Long userId) {
|
|
|
+ return userService.deleteUserById(userId);
|
|
|
+ }
|
|
|
}
|
