-- modify reg user by email

-- add  inviterId with reg info

src/main/java/com/ekexiu/portal/po/User.java

@@ -5,6 +5,7 @@ import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.defaultImpl.WIntHandler;
import org.jfw.apt.orm.core.enums.DE;
@@ -23,6 +24,7 @@ public class User implements CreateTimeSupported {
	private String createTime;
	private String inviteCode;
	private Integer sendMailStatus;
	private String inviterId;
	@Column(DE.id_32)
@@ -95,5 +97,13 @@ public class User implements CreateTimeSupported {
	public void setSendMailStatus(Integer sendMailStatus) {
		this.sendMailStatus = sendMailStatus;
	}
    @Column(handlerClass=StringHandler.class,dbType="CHAR(32)",insertable = true,renewable=false,queryable=true,nullable=true)
	public String getInviterId() {
		return inviterId;
	}
	public void setInviterId(String inviterId) {
		this.inviterId = inviterId;
	}
	
}

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

@@ -50,6 +50,7 @@ public class SysService {
	private String bindMailReplaceContentTempalte;
	private long timeLimitWithBindMail = 10 * 60 * 1000;
	private String regMailSubject = "注册[科袖网]用户";
	private String regMailReplaceKey;
	private String regMailReplaceContentTempalte;
	private long timeLimitWithRegMail = 10 * 60 * 1000;
@@ -70,7 +71,7 @@ public class SysService {
	private String regMobilePhoneReplaceKey;
	private String regMobilePhoneContentTemplate;
	private long timeLimitWithRegMobilePhone = 3 * 60 * 1000;
	
	private String phoneContentTemplate;
	private String phoneReplaceKey = "mobileCode";
	private String inviteReplacePhone = "phoneKey";
@@ -91,8 +92,7 @@ public class SysService {
		return regMailReplaceContentTempalte;
	}
	public void setRegMailReplaceContentTempalte(
			String regMailReplaceContentTempalte) {
	public void setRegMailReplaceContentTempalte(String regMailReplaceContentTempalte) {
		this.regMailReplaceContentTempalte = regMailReplaceContentTempalte;
	}
@@ -116,8 +116,7 @@ public class SysService {
		return regMobilePhoneContentTemplate;
	}
	public void setRegMobilePhoneContentTemplate(
			String regMobilePhoneContentTemplate) {
	public void setRegMobilePhoneContentTemplate(String regMobilePhoneContentTemplate) {
		this.regMobilePhoneContentTemplate = regMobilePhoneContentTemplate;
	}
@@ -133,8 +132,7 @@ public class SysService {
		return mailRetrievePasswordSubject;
	}
	public void setMailRetrievePasswordSubject(
			String mailRetrievePasswordSubject) {
	public void setMailRetrievePasswordSubject(String mailRetrievePasswordSubject) {
		this.mailRetrievePasswordSubject = mailRetrievePasswordSubject;
	}
@@ -150,8 +148,7 @@ public class SysService {
		return phoneRetrievePasswordReplaceKey;
	}
	public void setPhoneRetrievePasswordReplaceKey(
			String phoneRetrievePasswordReplaceKey) {
	public void setPhoneRetrievePasswordReplaceKey(String phoneRetrievePasswordReplaceKey) {
		this.phoneRetrievePasswordReplaceKey = phoneRetrievePasswordReplaceKey;
	}
@@ -159,8 +156,7 @@ public class SysService {
		return phoneRetrievePasswordContentTemplate;
	}
	public void setPhoneRetrievePasswordContentTemplate(
			String phoneRetrievePasswordContentTemplate) {
	public void setPhoneRetrievePasswordContentTemplate(String phoneRetrievePasswordContentTemplate) {
		this.phoneRetrievePasswordContentTemplate = phoneRetrievePasswordContentTemplate;
	}
@@ -168,8 +164,7 @@ public class SysService {
		return timeLimitWithPhoneRetrievePassword;
	}
	public void setTimeLimitWithPhoneRetrievePassword(
			long timeLimitWithPhoneRetrievePassword) {
	public void setTimeLimitWithPhoneRetrievePassword(long timeLimitWithPhoneRetrievePassword) {
		this.timeLimitWithPhoneRetrievePassword = timeLimitWithPhoneRetrievePassword;
	}
@@ -177,8 +172,7 @@ public class SysService {
		return timeLimitWithMailRetrivePassword;
	}
	public void setTimeLimitWithMailRetrivePassword(
			long timeLimitWithMailRetrivePassword) {
	public void setTimeLimitWithMailRetrivePassword(long timeLimitWithMailRetrivePassword) {
		this.timeLimitWithMailRetrivePassword = timeLimitWithMailRetrivePassword;
	}
@@ -194,8 +188,7 @@ public class SysService {
		return bindMobilePhoneContentTemplate;
	}
	public void setBindMobilePhoneContentTemplate(
			String bindMobilePhoneContentTemplate) {
	public void setBindMobilePhoneContentTemplate(String bindMobilePhoneContentTemplate) {
		this.bindMobilePhoneContentTemplate = bindMobilePhoneContentTemplate;
	}
@@ -203,13 +196,11 @@ public class SysService {
		return timeLimitWithBindMobilePhone;
	}
	public void setTimeLimitWithBindMobilePhone(
			long timeLimitWithBindMobilePhone) {
	public void setTimeLimitWithBindMobilePhone(long timeLimitWithBindMobilePhone) {
		this.timeLimitWithBindMobilePhone = timeLimitWithBindMobilePhone;
	}
	public void setMailRetrievePasswordContentTemplate(
			String retrievePasswordContentTemplate) {
	public void setMailRetrievePasswordContentTemplate(String retrievePasswordContentTemplate) {
		this.mailRetrievePasswordContentTemplate = retrievePasswordContentTemplate;
	}
@@ -233,8 +224,7 @@ public class SysService {
		return mailRetrievePasswordReplaceKey;
	}
	public void setMailRetrievePasswordReplaceKey(
			String retrievePasswordReplaceKey) {
	public void setMailRetrievePasswordReplaceKey(String retrievePasswordReplaceKey) {
		this.mailRetrievePasswordReplaceKey = retrievePasswordReplaceKey;
	}
@@ -254,8 +244,7 @@ public class SysService {
		return bindMailReplaceContentTempalte;
	}
	public void setBindMailReplaceContentTempalte(
			String bindMailReplaceContentTempalte) {
	public void setBindMailReplaceContentTempalte(String bindMailReplaceContentTempalte) {
		this.bindMailReplaceContentTempalte = bindMailReplaceContentTempalte;
	}
@@ -339,24 +328,32 @@ public class SysService {
		this.mailservice = mailservice;
	}
	public String getRegMailSubject() {
		return regMailSubject;
	}
	public void setRegMailSubject(String regMailSubject) {
		this.regMailSubject = regMailSubject;
	}
	@Get
	@Path("/getMD5")
	public String getUUID(@JdbcConn Connection con, String pass)
			throws SQLException {
	public String getUUID(@JdbcConn Connection con, String pass) throws SQLException {
		return StringUtil.md5(pass);
	}
	
	/**
	 * 验证注册时填写的手机号和邮箱是否已经注册过
	 * 
	 * @param con
	 * @param key 手机号或邮箱
	 * @param key
	 *            手机号或邮箱
	 * @return 如果该手机或邮箱已经注册过返回false， 否则返回true
	 * @throws SQLException
	 */
	@Get
	@Path("/isReg")
	public boolean isReg(@JdbcConn Connection con, String key)
			throws SQLException {
	public boolean isReg(@JdbcConn Connection con, String key) throws SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, key);
		if (null != user) {
			return false;
@@ -364,11 +361,11 @@ public class SysService {
			return true;
		}
	}
	
	@Get
	@Path("/qaUser")
	public User queryUser(@JdbcConn Connection con, String id) throws SQLException{
		User user =  this.userDao.query(con, id);
	public User queryUser(@JdbcConn Connection con, String id) throws SQLException {
		User user = this.userDao.query(con, id);
		User user2 = new User();
		user2.setId(user.getId());
		user2.setMobilePhone(user.getMobilePhone());
@@ -390,16 +387,14 @@ public class SysService {
	 *            注册密码
	 * @return
	 * @throws SQLException
	 * @throws JfwBaseException 
	 * @throws JfwBaseException
	 */
	@Post
	@Path("/regmobile")
	public String regMobile(@JdbcConn(true) Connection con, String state,
			String mobilePhone, String validateCode, String password)
	public String regMobile(@JdbcConn(true) Connection con, String state, String mobilePhone, String validateCode, String password, @Nullable String inviterId)
			throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null)
			return "验证超时";
		if (sc.getExpiredTime() < System.currentTimeMillis())
@@ -416,7 +411,8 @@ public class SysService {
			String passwd = StringUtil.md5(password);
			user.setMobilePhone(mobilePhone);
			user.setPasswd(passwd);
			user.setUserType(0 + "");
			user.setUserType("0");
	        user.setInviterId(inviterId);
			this.userDao.insert(con, user);
			return user.getId();
		} finally {
@@ -430,48 +426,38 @@ public class SysService {
	 * @param con
	 * @param key
	 *            发送邮箱验证的返回值
	 * @param mail
	 *            验证的邮箱地址
	 * 
	 * @return 验证成功 用户登录并返回用户信息 验证失败返回null
	 * @throws SQLException
	 * @throws JfwBaseException 
	 * @throws JfwBaseException
	 */
	@SetCookie(checkResultNull = true, path = "/", value = {
			"userid=result.getId()", "userMobilePhone=result.getMobilePhone()",
			"userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" 
			})
	@Post
	@Get
	@Path("/regmail/{key}")
	public SessionUser regeMail(@JdbcConn(true) Connection con, @PathVar String key, String mail, 
			String userId) throws SQLException, JfwBaseException {
	public void regeMail(@JdbcConn(false) Connection con, @PathVar String key) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(key);
		if (sc == null) {
			this.userDao.delete(con, userId);
			throw new JfwBaseException("验证超时");
		}
		if (sc.getExpiredTime() < System.currentTimeMillis()) {
			this.userDao.delete(con, userId);
			throw new JfwBaseException("验证超时");
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(key);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis()) {
			throw new JfwBaseException(-1, "验证链接已失效");
		}
		try {
			User user = userDao.queryByEmailOrMobilePhone(con, mail);
			if (null == user)
				return null;
			SessionUser ret = new SessionUser();
			ret.setId(user.getId());
			if (null != this.professorDao.query(con, user.getId())) {
				ret.setName(this.professorDao.query(con, user.getId()).getName());
			User user = new User();
			user.setEmail(sc.getCode());
			user.setId(StringUtil.buildUUID());
			user.setSendMailStatus(0);
			user.setPasswd(StringUtil.md5(sc.getKey()));
			user.setUserType("0");
			user.setInviterId(sc.getValue());
			this.userDao.insert(con, user);
			con.commit();
		} catch (SQLException e) {
			try {
				con.rollback();
			} catch (Exception ee) {
			}
			if ("23505".equals(e.getSQLState())) {
				throw new JfwBaseException(-3, "邮箱[" + sc.getCode() + "]已被注册过了");
			}
			ret.setMobilePhone(user.getMobilePhone());
			ret.setType(user.getUserType());
			ret.setEmail(user.getEmail());
			ret.setAuth(true);
			return ret;
			throw e;
		} finally {
			JfwAppContext.removeCachedObject(key);
		}
@@ -479,80 +465,61 @@ public class SysService {
	/**
	 * 邮箱注册并发送邮箱验证
	 * 
	 * @param con
	 * @param mail 待验证的邮箱地址
	 * @param password 密码
	 * @return 注册成功并发动验证返回用户ID  用户已注册返回null  邮件发送失败抛出异常
	 * @param mail
	 *            待验证的邮箱地址
	 * @param password
	 *            密码
	 * @throws JfwBaseException
	 * @throws SQLException
	 */
	@Get
	@Post
	@Path("/regmail")
	public String regMail(@JdbcConn(true) Connection con, String mail,
			String password) throws JfwBaseException, SQLException {
		User user1 = new User();
	public void regMail(@JdbcConn(false) Connection con, String mail, String password,@Nullable String inviterId) throws JfwBaseException, SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mail);
		if (null != user) {
			return null;
			throw new JfwBaseException(-1, "邮箱[" + mail + "]已被注册过了");
		} else {
			user1.setId(StringUtil.buildUUID());
			String passwd = StringUtil.md5(password);
			user1.setEmail(mail);
			user1.setPasswd(passwd);
			user1.setUserType(0 + "");
			this.userDao.insert(con, user1);
			this.sendMailReg(con, mail);
		}
		return user1.getId();
	}
	
	@Get
	@Path("/resendMail")
	public boolean sendMailReg(@JdbcConn(false) Connection con, String mail) throws JfwBaseException {
		StateCode<String, String> sc = new StateCode<String, String>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
		Map<String, String> map = new HashMap<String, String>();
		map.put(this.regMailReplaceKey, key);
		try {
			mailservice.sendSimpleMail(mail,
					this.regMailReplaceContentTempalte, map,
					this.bindMailSubject);
			long ct = System.currentTimeMillis();
			long et = ct + this.timeLimitWithRegMail + 10000;
			sc.setBuildTime(ct);
			sc.setExpiredTime(et);
			JfwAppContext.getScheduledExecutorService().schedule(
					new Runnable() {
						@Override
						public void run() {
							JfwAppContext.removeCachedObject(key);
						}
					}, this.timeLimitWithRegMail + 20000,
					TimeUnit.MILLISECONDS);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10011, "send mail to " + mail
					+ " error", e);
			StateCode<String, String> sc = new StateCode<String, String>();
			final String key = JfwAppContext.cacheObjectAndGenKey(sc);
			Map<String, String> map = new HashMap<>();
			map.put(this.regMailReplaceKey, key);
			try {
				this.mailservice.sendSimpleMail(mail, this.regMailReplaceContentTempalte, map, this.regMailSubject);
			} catch (MessagingException e) {
				JfwAppContext.removeCachedObject(key);
				throw new JfwBaseException(-2, "给邮箱[" + mail + "]发邮件错误", e);
			}
			sc.setCode(mail);
			sc.setKey(password);
			sc.setValue(inviterId);
			sc.setBuildTime(System.currentTimeMillis());
			sc.setExpiredTime(sc.getBuildTime() + this.timeLimitWithRegMail);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithRegMail, TimeUnit.MILLISECONDS);
		}
		return true;
	}
	
	@Get
	@Path("/sendMailInvite")
	public String sendMailInvite(@JdbcConn(false) Connection con,String id) 
			throws SQLException, MessagingException, JfwBaseException {
	public String sendMailInvite(@JdbcConn(false) Connection con, String id) throws SQLException, MessagingException, JfwBaseException {
		User user = this.userDao.query(con, id);
		if(user == null){
		if (user == null) {
			throw new JfwBaseException("系统没有此用户");
		}
		if(user.getEmail() == null){
		if (user.getEmail() == null) {
			throw new JfwBaseException("邮箱不能为空");
		}
		if(user.getInviteCode() == null){
		if (user.getInviteCode() == null) {
			throw new JfwBaseException("该用户没有邀请码");
		}
		if(user != null && user.getEmail() != null && user.getInviteCode() != null){
		if (user != null && user.getEmail() != null && user.getInviteCode() != null) {
		}
		String mailContent = this.inviteMailContentTempalte;
		mailContent = mailContent.replaceAll(this.inviteReplaceEmail, user.getEmail());
@@ -567,17 +534,13 @@ public class SysService {
		this.mailservice.sendSimpleMail(user.getEmail(), mailContent, null, this.inviteMailSubject);
		return "send success !";
	}
	
	@SetCookie(checkResultNull = true, path = "/", value = {
			"userid=result.getId()", "userMobilePhone=result.getMobilePhone()",
			"userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" 
			})
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/invitelogin")
	public SessionUser inviteLogin(@JdbcConn Connection con,String key,String code) throws SQLException { 
	public SessionUser inviteLogin(@JdbcConn Connection con, String key, String code) throws SQLException {
		User user = userDao.queryByEmailOrMobilePhone(con, key);
		if (null == user) {
			return null;
@@ -596,17 +559,12 @@ public class SysService {
		return ret;
	}
	@SetCookie(checkResultNull = true, path = "/", value = {
			"userid=result.getId()", "userMobilePhone=result.getMobilePhone()",
			"userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" 
			})
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/slogin")
	public SessionUser sLogin(@JdbcConn Connection con, String code,
			String mobile) throws SQLException {
	public SessionUser sLogin(@JdbcConn Connection con, String code, String mobile) throws SQLException {
		User user = userDao.query(con, code);
		if (null == user)
			return null;
@@ -623,20 +581,15 @@ public class SysService {
		return ret;
	}
	@SetCookie(checkResultNull = true, path = "/", value = {
			"userid=result.getId()", "userMobilePhone=result.getMobilePhone()",
			"userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")"
			})
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/login")
	public SessionUser login(@JdbcConn Connection con, String lk, String pw)
			throws SQLException,JfwBaseException {
	public SessionUser login(@JdbcConn Connection con, String lk, String pw) throws SQLException, JfwBaseException {
		User user = userDao.queryByEmailOrMobilePhone(con, lk);
		if (null == user)
			throw new JfwBaseException(-1,"该用户还未注册");
			throw new JfwBaseException(-1, "该用户还未注册");
		if (DEFAULT_PASS_WORD.equals(user.getPasswd()))
			return null;
		if (!StringUtil.md5(pw).equals(user.getPasswd()))
@@ -644,8 +597,8 @@ public class SysService {
		SessionUser ret = new SessionUser();
		ret.setId(user.getId());
		Professor pf =  this.professorDao.query(con, user.getId());
		if (null !=pf) {
		Professor pf = this.professorDao.query(con, user.getId());
		if (null != pf) {
			ret.setName(pf.getName());
		}
		ret.setMobilePhone(user.getMobilePhone());
@@ -657,8 +610,7 @@ public class SysService {
	@Post
	@Path("/cp")
	public boolean changePw(@JdbcConn(true) Connection con, String id,
			String npw, @Nullable String onw) throws SQLException {
	public boolean changePw(@JdbcConn(true) Connection con, String id, String npw, @Nullable String onw) throws SQLException {
		User user = this.userDao.query(con, id);
		if (user == null)
			return false;
@@ -675,8 +627,7 @@ public class SysService {
	@Get
	@Path("/reqBindMail")
	public boolean reqBindMail(@JdbcConn(false) Connection con, String userid,
			String mail) throws JfwBaseException, SQLException {
	public boolean reqBindMail(@JdbcConn(false) Connection con, String userid, String mail) throws JfwBaseException, SQLException {
		User user = this.userDao.query(con, userid);
		if (null == user)
			return false;
@@ -689,43 +640,36 @@ public class SysService {
		Map<String, String> map = new HashMap<String, String>();
		map.put(this.bindMailReplaceKey, key);
		try {
			mailservice.sendSimpleMail(mail,
					this.bindMailReplaceContentTempalte, map,
					this.bindMailSubject);
			mailservice.sendSimpleMail(mail, this.bindMailReplaceContentTempalte, map, this.bindMailSubject);
			long ct = System.currentTimeMillis();
			long et = ct + this.timeLimitWithBindMail + 10000;
			sc.setBuildTime(ct);
			sc.setExpiredTime(et);
			JfwAppContext.getScheduledExecutorService().schedule(
					new Runnable() {
						@Override
						public void run() {
							JfwAppContext.removeCachedObject(key);
						}
					}, this.timeLimitWithBindMail + 20000,
					TimeUnit.MILLISECONDS);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithBindMail + 20000, TimeUnit.MILLISECONDS);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10011,
					"send mail to " + mail + " error", e);
			throw new JfwBaseException(10011, "send mail to " + mail + " error", e);
		}
		return true;
	}
	@Get
	@Path("/bindMail/{key}")
	public boolean bindMail(@JdbcConn(true) Connection con, @PathVar String key)
			throws SQLException, JfwBaseException {
	public boolean bindMail(@JdbcConn(true) Connection con, @PathVar String key) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(key);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(key);
		if (sc == null)
			return false;
		if (sc.getExpiredTime() < System.currentTimeMillis())
			return false;
		try {
			Professor professor = this.professorDao.queryOne(con, sc.getKey());
			if(professor.getPhone() == null || professor.getPhone().isEmpty()){
			if (professor.getPhone() == null || professor.getPhone().isEmpty()) {
				this.professorDao.updateEmail(con, sc.getKey(), sc.getValue());
			}
			return this.userDao.updateEmail(con, sc.getValue(), sc.getKey()) > 0;
@@ -736,9 +680,7 @@ public class SysService {
	@Get
	@Path("/vcWithBind")
	public String reqBindBindMobilePhone(@JdbcConn(false) Connection con,
			String userid, String mobilePhone) throws JfwBaseException,
			SQLException {
	public String reqBindBindMobilePhone(@JdbcConn(false) Connection con, String userid, String mobilePhone) throws JfwBaseException, SQLException {
		User user = this.userDao.query(con, userid);
		if (null == user)
			return null;
@@ -757,25 +699,20 @@ public class SysService {
			String vc = String.format("%04d", vi);
			sc.setKey(mobilePhone);
			sc.setValue(vc);
			this.mobilePhoneServcie.sendMessage(mobilePhone,
					this.bindMobilePhoneContentTemplate,
					this.bindMobilePhoneReplaceKey, vc);
			this.mobilePhoneServcie.sendMessage(mobilePhone, this.bindMobilePhoneContentTemplate, this.bindMobilePhoneReplaceKey, vc);
			long ct = System.currentTimeMillis();
			long et = ct + this.timeLimitWithBindMobilePhone + 5000;
			sc.setBuildTime(ct);
			sc.setExpiredTime(et);
			JfwAppContext.getScheduledExecutorService().schedule(
					new Runnable() {
						@Override
						public void run() {
							JfwAppContext.removeCachedObject(key);
						}
					}, this.timeLimitWithBindMobilePhone + 10000,
					TimeUnit.MILLISECONDS);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithBindMobilePhone + 10000, TimeUnit.MILLISECONDS);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10012, "send mobile phone message to "
					+ mobilePhone + " error", e);
			throw new JfwBaseException(10012, "send mobile phone message to " + mobilePhone + " error", e);
		}
		return key;
	}
@@ -792,8 +729,7 @@ public class SysService {
	 */
	@Get
	@Path("/regmobilephone")
	public String regMobilePhone(@JdbcConn(false) Connection con,
			String mobilePhone) throws JfwBaseException, SQLException {
	public String regMobilePhone(@JdbcConn(false) Connection con, String mobilePhone) throws JfwBaseException, SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
		if (null != user) {
			return null;
@@ -810,47 +746,39 @@ public class SysService {
			String vc = String.format("%04d", vi);
			sc.setKey(mobilePhone);
			sc.setValue(vc);
			this.mobilePhoneServcie.sendMessage(mobilePhone,
					this.regMobilePhoneContentTemplate,
					this.regMobilePhoneReplaceKey, vc);
			this.mobilePhoneServcie.sendMessage(mobilePhone, this.regMobilePhoneContentTemplate, this.regMobilePhoneReplaceKey, vc);
			long ct = System.currentTimeMillis();
			long et = ct + this.timeLimitWithRegMobilePhone + 5000;
			sc.setBuildTime(ct);
			sc.setExpiredTime(et);
			JfwAppContext.getScheduledExecutorService().schedule(
					new Runnable() {
						@Override
						public void run() {
							JfwAppContext.removeCachedObject(key);
						}
					}, this.timeLimitWithRegMobilePhone + 10000,
					TimeUnit.MILLISECONDS);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithRegMobilePhone + 10000, TimeUnit.MILLISECONDS);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10012, "send mobile phone message to "
					+ mobilePhone + " error", e);
			throw new JfwBaseException(10012, "send mobile phone message to " + mobilePhone + " error", e);
		}
		return key;
	}
	@Post
	@Path("/bindMobilePhone")
	public boolean bindMobilePhone(@JdbcConn(true) Connection con,
			String state, String userid, String mobilePhone, String validateCode)
	public boolean bindMobilePhone(@JdbcConn(true) Connection con, String state, String userid, String mobilePhone, String validateCode)
			throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null)
			return false;
		if (sc.getExpiredTime() < System.currentTimeMillis())
			return false;
		try {
			if (!sc.getKey().equals(mobilePhone)
					|| !sc.getValue().equals(validateCode))
			if (!sc.getKey().equals(mobilePhone) || !sc.getValue().equals(validateCode))
				return false;
			Professor professor = this.professorDao.queryOne(con, userid);
			if(professor.getPhone() == null || professor.getPhone().isEmpty()){
			if (professor.getPhone() == null || professor.getPhone().isEmpty()) {
				this.professorDao.updatePhone(con, userid, mobilePhone);
			}
			return this.userDao.updateMobilePhone(con, mobilePhone, userid) > 0;
@@ -861,8 +789,7 @@ public class SysService {
	@Get
	@Path("/vcWithRP")
	public String rePassWordWithPhone(@JdbcConn(false) Connection con,
			String mobilePhone) throws JfwBaseException, SQLException {
	public String rePassWordWithPhone(@JdbcConn(false) Connection con, String mobilePhone) throws JfwBaseException, SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
		if (null == user)
@@ -877,25 +804,20 @@ public class SysService {
			String vc = String.format("%04d", vi);
			sc.setKey(mobilePhone);
			sc.setValue(vc);
			this.mobilePhoneServcie.sendMessage(mobilePhone,
					this.phoneRetrievePasswordContentTemplate,
					this.phoneRetrievePasswordReplaceKey, vc);
			this.mobilePhoneServcie.sendMessage(mobilePhone, this.phoneRetrievePasswordContentTemplate, this.phoneRetrievePasswordReplaceKey, vc);
			long ct = System.currentTimeMillis();
			long et = ct + this.timeLimitWithPhoneRetrievePassword + 5000;
			sc.setBuildTime(ct);
			sc.setExpiredTime(et);
			JfwAppContext.getScheduledExecutorService().schedule(
					new Runnable() {
						@Override
						public void run() {
							JfwAppContext.removeCachedObject(key);
						}
					}, this.timeLimitWithPhoneRetrievePassword + 10000,
					TimeUnit.MILLISECONDS);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithPhoneRetrievePassword + 10000, TimeUnit.MILLISECONDS);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10012, "send mobile phone message to "
					+ mobilePhone + " error", e);
			throw new JfwBaseException(10012, "send mobile phone message to " + mobilePhone + " error", e);
		}
		return key;
	}
@@ -904,8 +826,7 @@ public class SysService {
	@Path("/validCode")
	public boolean validCode(String state, String vc) throws JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null) {
			throw new JfwBaseException("验证超时");
		}
@@ -914,22 +835,22 @@ public class SysService {
		}
		return sc.getValue().equals(vc);
	}
	
	@Post
	@Path("/checkPicture")
	public boolean checkPictureVC(@SessionVal(value = "verification",defaultvalue="null",remove=true) String verification, 
			String submitVerification) throws JfwBaseException {
		if(null==verification){throw new JfwBaseException("Picture is expire !");}
	public boolean checkPictureVC(@SessionVal(value = "verification", defaultvalue = "null", remove = true) String verification, String submitVerification)
			throws JfwBaseException {
		if (null == verification) {
			throw new JfwBaseException("Picture is expire !");
		}
		return verification.equals(submitVerification);
	}
	@Post
	@Path("/resetPasswordWithMobilePhone")
	public boolean resetPassword(@JdbcConn(true) Connection con, String state,
			String mobilePhone, String pw, String vc) throws SQLException, JfwBaseException {
	public boolean resetPassword(@JdbcConn(true) Connection con, String state, String mobilePhone, String pw, String vc) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null) {
			throw new JfwBaseException("验证超时");
		}
@@ -939,8 +860,7 @@ public class SysService {
		try {
			if (!sc.getKey().equals(mobilePhone) || !sc.getValue().equals(vc))
				return false;
			return this.userDao.updatePasswordWithMobileOrEmail(con,
					StringUtil.md5(pw), mobilePhone) > 0;
			return this.userDao.updatePasswordWithMobileOrEmail(con, StringUtil.md5(pw), mobilePhone) > 0;
		} finally {
			JfwAppContext.removeCachedObject(state);
		}
@@ -948,8 +868,7 @@ public class SysService {
	@Get
	@Path("/reqRpWithEmail")
	public boolean reqRpWithEmail(@JdbcConn(false) Connection con, String mail)
			throws JfwBaseException, SQLException {
	public boolean reqRpWithEmail(@JdbcConn(false) Connection con, String mail) throws JfwBaseException, SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mail);
		if (user == null)
			return false;
@@ -960,25 +879,20 @@ public class SysService {
		Map<String, String> map = new HashMap<String, String>();
		map.put(this.mailRetrievePasswordReplaceKey, key);
		try {
			mailservice.sendSimpleMail(mail,
					this.mailRetrievePasswordContentTemplate, map,
					this.mailRetrievePasswordSubject);
			mailservice.sendSimpleMail(mail, this.mailRetrievePasswordContentTemplate, map, this.mailRetrievePasswordSubject);
			long ct = System.currentTimeMillis();
			long et = ct + this.timeLimitWithMailRetrivePassword + 10000;
			sc.setBuildTime(ct);
			sc.setExpiredTime(et);
			JfwAppContext.getScheduledExecutorService().schedule(
					new Runnable() {
						@Override
						public void run() {
							JfwAppContext.removeCachedObject(key);
						}
					}, this.timeLimitWithMailRetrivePassword + 20000,
					TimeUnit.MILLISECONDS);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithMailRetrivePassword + 20000, TimeUnit.MILLISECONDS);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10011,
					"send mail to " + mail + " error", e);
			throw new JfwBaseException(10011, "send mail to " + mail + " error", e);
		}
		return true;
	}
@@ -987,8 +901,7 @@ public class SysService {
	@Path("/validMailState")
	public boolean validMailState(String state) {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null)
			return false;
		if (sc.getExpiredTime() < System.currentTimeMillis())
@@ -998,11 +911,9 @@ public class SysService {
	@Post
	@Path("/resetPasswordWith")
	public boolean resetPassword(@JdbcConn(true) Connection con, String state,
			String pw) throws SQLException, JfwBaseException {
	public boolean resetPassword(@JdbcConn(true) Connection con, String state, String pw) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext
				.getCachedObject(state);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null)
			throw new JfwBaseException("验证超时");
		if (sc.getExpiredTime() < System.currentTimeMillis())
@@ -1014,7 +925,7 @@ public class SysService {
			JfwAppContext.removeCachedObject(state);
		}
	}
	
	public static void main(String[] args) {
		System.out.println(String.format("%04d", new Random().nextInt(10000)));
	}