修改验证超时提示信息。

src/main/java/com/ekexiu/portal/service/SysService.java

@@ -57,7 +57,7 @@ public class SysService {
	private String phoneRetrievePasswordReplaceKey;
	private String phoneRetrievePasswordContentTemplate;
	private long timeLimitWithPhoneRetrievePassword =  60 * 1000;
	private long timeLimitWithPhoneRetrievePassword = 3 * 60 * 1000;
	private String mailRetrievePasswordContentTemplate;
	private String mailRetrievePasswordReplaceKey;
@@ -323,19 +323,15 @@ public class SysService {
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		if (sc == null)
			return "state码错误！";
//			throw new JfwBaseException("state码错误！");
			return "验证超时";
		if (sc.getExpiredTime() < System.currentTimeMillis())
			return "验证超时！";
//			throw new JfwBaseException("验证超时！");
			return "验证超时";
		try {
			if (!sc.getKey().equals(mobilePhone)) {
				return "手机号与验证手机不匹配！";
//				throw new JfwBaseException("手机号与验证手机不匹配！");
				return "手机号与验证手机不匹配";
			}
			if (!sc.getValue().equals(validateCode)) {
				return "验证码错误！";
//				throw new JfwBaseException("验证码错误！");
				return "验证码错误";
			}
			User user = new User();
			user.setId(StringUtil.buildUUID());
@@ -378,11 +374,11 @@ public class SysService {
				.getCachedObject(key);
		if (sc == null) {
			this.userDao.delete(con, userId);
			throw new JfwBaseException("state码错误！");
			throw new JfwBaseException("验证超时");
		}
		if (sc.getExpiredTime() < System.currentTimeMillis()) {
			this.userDao.delete(con, userId);
			throw new JfwBaseException("验证超时！");
			throw new JfwBaseException("验证超时");
		}
		try {
			User user = userDao.queryByEmailOrMobilePhone(con, mail);
@@ -504,7 +500,7 @@ public class SysService {
			throws SQLException {
		User user = userDao.queryByEmailOrMobilePhone(con, lk);
		if (null == user)
			throw new SQLException("该用户还未注册！");
			throw new SQLException("该用户还未注册");
		if (DEFAULT_PASS_WORD.equals(user.getPasswd()))
			return null;
		if (!StringUtil.md5(pw).equals(user.getPasswd()))
@@ -607,8 +603,7 @@ public class SysService {
			return null;
		user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
		if (null != user)
			return "该手机号已经绑定用户！";
//			throw new JfwBaseException("该手机号已经绑定用户！");
			return "该手机号已经绑定其他用户";
		StateCode<String, String> sc = new StateCode<String, String>();
@@ -726,8 +721,7 @@ public class SysService {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
		if (null == user)
			return "该手机号还未注册！";
//			throw new JfwBaseException("该手机号还未注册！");
			return "该手机号还未注册";
		StateCode<String, String> sc = new StateCode<String, String>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
@@ -768,10 +762,10 @@ public class SysService {
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		if (sc == null) {
			throw new JfwBaseException("state码错误！");
			throw new JfwBaseException("验证超时");
		}
		if (sc.getExpiredTime() < System.currentTimeMillis()) {
			throw new JfwBaseException("验证超时！");
			throw new JfwBaseException("验证超时");
		}
		return sc.getValue().equals(vc);
	}
@@ -784,10 +778,10 @@ public class SysService {
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		if (sc == null) {
			return false;
			throw new JfwBaseException("验证超时");
		}
		if (sc.getExpiredTime() < System.currentTimeMillis()) {
			return false;
			throw new JfwBaseException("验证超时");
		}
		try {
			if (!sc.getKey().equals(mobilePhone) || !sc.getValue().equals(vc))
@@ -857,9 +851,9 @@ public class SysService {
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		if (sc == null)
			return false;
			throw new JfwBaseException("验证超时");
		if (sc.getExpiredTime() < System.currentTimeMillis())
			return false;
			throw new JfwBaseException("验证超时");
		String key = sc.getKey();
		try {
			return this.userDao.updatePassword(con, StringUtil.md5(pw), key) > 0;