diff --git a/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyEmailInterceptor.java b/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyEmailInterceptor.java index 9789562c..4b65bbdd 100644 --- a/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyEmailInterceptor.java +++ b/dsBase/src/main/java/com/dsideal/base/Interceptor/VerifyEmailInterceptor.java @@ -6,6 +6,7 @@ import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; import org.apache.commons.lang3.StringUtils; + @SuppressWarnings("unchecked") public class VerifyEmailInterceptor implements Interceptor { @Override @@ -26,29 +27,24 @@ public class VerifyEmailInterceptor implements Interceptor { } String email = con.getPara("email"); String personId = con.getPara("person_id"); - LoginPersonModel personModel=new LoginPersonModel(); + LoginPersonModel personModel = new LoginPersonModel(); if (StringUtils.isBlank(email)) { inv.invoke(); } else { if (!CommonUtil.getIsEmailLegal(email)) { con.renderJson(CommonUtil.returnMessageJson(false, "邮箱格式不正确!")); - return; } else { - int emailRes = 0; + boolean emailRes; if (personId == null) { emailRes = personModel.getEmailIsExist(email); } else { emailRes = personModel.getEmailIsExist(email, personId); } - if (emailRes == 0) { + if (!emailRes) { inv.invoke(); - } else if (emailRes == 1) { - con.renderJson(CommonUtil.returnMessageJson(false, "邮箱已存在")); - return; } else { - con.renderJson(CommonUtil.returnMessageJson(false, "操作异常!")); - return; + con.renderJson(CommonUtil.returnMessageJson(false, "邮箱已存在")); } } } diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java index 24420ff5..99efb42d 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java @@ -175,10 +175,10 @@ public class LoginPersonModel { * @param email * @return 0:不存在 1:已存在 2:异常 */ - public int getEmailIsExist(String email) { + public boolean getEmailIsExist(String email) { String sql = Db.getSql("loginPerson.getEmailIsExist"); Record record = Db.findFirst(sql, email); - return record == null ? 2 : 1; + return record != null; } /** @@ -189,10 +189,10 @@ public class LoginPersonModel { * @param email * @return 0:不存在 1:已存在 2:异常 */ - public int getEmailIsExist(String email, String person_id) { + public boolean getEmailIsExist(String email, String person_id) { String sql = Db.getSql("loginPerson.getEmailIsExistByPersonId"); Record record = Db.findFirst(sql, email, person_id); - return record == null ? 2 : 1; + return record != null; } public JSONObject doLogin(String username, String password, String platform, HttpServletResponse response) {