2

pom.xml

@@ -118,6 +118,11 @@
			<artifactId>slf4j-log4j12</artifactId>
			<version>1.7.21</version>
		</dependency>
		<dependency>
			<groupId>com.googlecode.json-simple</groupId>
			<artifactId>json-simple</artifactId>
			<version>1.1.1</version>
		</dependency>
	</dependencies>
	<build>
		<resources>

src/main/java/com/ekexiu/portal/dao/UserOpenIdDao.java

@@ -30,5 +30,9 @@ public interface UserOpenIdDao {
    @SelectOne
    @Nullable
    UserOpenId query(Connection con, String oauthType, String userid) throws SQLException;
    UserOpenId queryByUserid(Connection con, String oauthType, String userid) throws SQLException;
    
    @SelectOne
    @Nullable
    UserOpenId queryByOpenid(Connection con, String oauthType, String openid) throws SQLException;
}

src/main/java/com/ekexiu/portal/oauth/OAuthService.java

@@ -22,174 +22,238 @@ import com.ekexiu.portal.dao.UserOpenIdDao;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.po.UserOpenId;
import com.ekexiu.portal.pojo.SessionUser;
import com.ekexiu.portal.service.SysService;
@Path("/oauth")
public class OAuthService {
    private long expriesWithOpenId = 1000 * 60 * 10;
    @Autowrie
    private UserOpenIdDao userOpenIdDao;
    @Autowrie
    private UserDao userDao;
    @Autowrie
    private ProfessorDao professorDao;
    private Map<String, OAuthHandler> handlers;
    public Map<String, OAuthHandler> getHandlers() {
        return handlers;
    }
    public void setHandlers(Map<String, OAuthHandler> handlers) {
        this.handlers = handlers;
    }
    public UserOpenIdDao getUserOpenIdDao() {
        return userOpenIdDao;
    }
    public void setUserOpenIdDao(UserOpenIdDao userOpenIdDao) {
        this.userOpenIdDao = userOpenIdDao;
    }
    public UserDao getUserDao() {
        return userDao;
    }
    public void setUserDao(UserDao userDao) {
        this.userDao = userDao;
    }
    public long getExpriesWithOpenId() {
        return expriesWithOpenId;
    }
    public void setExpriesWithOpenId(long expriesWithOpenId) {
        this.expriesWithOpenId = expriesWithOpenId;
    }
    public ProfessorDao getProfessorDao() {
        return professorDao;
    }
    public void setProfessorDao(ProfessorDao professorDao) {
        this.professorDao = professorDao;
    }
    @Get
    @Path("/validCode")
    public AuthLoginResponse validCode(@JdbcConn Connection con, String code, String state) throws SQLException, JfwBaseException {
        OAuthHandler oah = this.handlers.get(state);
        if (oah == null)
            throw new IllegalArgumentException("非法的参数{state=" + state);
        OAuthUser ou = oah.login(code);
        UserOpenId uoi = this.userOpenIdDao.query(con, oah.getType(), ou.getOpenId());
        StateCode<OAuthUser, UserOpenId> sc = new StateCode<OAuthUser, UserOpenId>();
        final String key = JfwAppContext.cacheObjectAndGenKey(sc);
        sc.setKey(ou);
        sc.setValue(uoi);
        sc.setBuildTime(System.currentTimeMillis());
        sc.setExpiredTime(sc.getBuildTime() + this.expriesWithOpenId);
        JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
            @Override
            public void run() {
                JfwAppContext.removeCachedObject(key);
            }
        }, this.expriesWithOpenId, TimeUnit.MILLISECONDS);
        AuthLoginResponse alr = new AuthLoginResponse();
        alr.setAssociated(null != uoi);
        alr.setAuthCode(key);
        return alr;
    }
    @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 authCode) throws SQLException, JfwBaseException {
        @SuppressWarnings("unchecked")
        StateCode<OAuthUser, UserOpenId> sc = (StateCode<OAuthUser, UserOpenId>) JfwAppContext.getCachedObject(authCode);
        JfwAppContext.removeCachedObject(authCode);
        if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
            throw new JfwBaseException(-1, "authCode is expired");
        if (null == sc.getValue())
            throw new JfwBaseException(-2, "authCode is invalid openid not associate local user");
        User user = this.userDao.query(con, sc.getValue().getUserid());
        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());
        }
        ret.setMobilePhone(user.getMobilePhone());
        ret.setType(user.getUserType());
        ret.setEmail(user.getEmail());
        ret.setAuth(!SysService.DEFAULT_PASS_WORD.equals(user.getPasswd()));
        return ret;
    }
    @Post
    @Path("/validOpenid")
    public AuthLoginResponse validOpenid(@JdbcConn Connection con, String authType, String openid) throws SQLException, JfwBaseException {
        OAuthUser ou = new OAuthUser();
        ou.setType(authType);
        ou.setOpenId(openid);
        UserOpenId uoi = this.userOpenIdDao.query(con, authType, openid);
        AuthLoginResponse alr = new AuthLoginResponse();
        StateCode<OAuthUser, UserOpenId> sc = new StateCode<OAuthUser, UserOpenId>();
        final String key = JfwAppContext.cacheObjectAndGenKey(sc);
        sc.setKey(ou);
        sc.setValue(uoi);
        sc.setBuildTime(System.currentTimeMillis());
        sc.setExpiredTime(sc.getBuildTime() + this.expriesWithOpenId);
        JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
            @Override
            public void run() {
                JfwAppContext.removeCachedObject(key);
            }
        }, this.expriesWithOpenId, TimeUnit.MILLISECONDS);
        alr.setAssociated(null != uoi);
        alr.setAuthCode(key);
        return alr;
    }
    
    @Get
    @Path("/redirectUris")
    public Map<String, String> getRedirectUris() {
        Map<String, String> ret = new HashMap<String, String>();
        for (Map.Entry<String, OAuthHandler> h : this.handlers.entrySet()) {
            ret.put(h.getKey(), h.getValue().getLoginUrl());
        }
        return ret;
    }
    public static class AuthLoginResponse {
        private boolean associated;
        private String authCode;
        public boolean isAssociated() {
            return associated;
        }
        public void setAssociated(boolean associated) {
            this.associated = associated;
        }
        public String getAuthCode() {
            return authCode;
        }
        public void setAuthCode(String authCode) {
            this.authCode = authCode;
        }
    }
	private long expriesWithOpenId = 1000 * 60 * 10;
	@Autowrie
	private UserOpenIdDao userOpenIdDao;
	@Autowrie
	private UserDao userDao;
	@Autowrie
	private ProfessorDao professorDao;
	private Map<String, OAuthHandler> handlers;
	public Map<String, OAuthHandler> getHandlers() {
		return handlers;
	}
	public void setHandlers(Map<String, OAuthHandler> handlers) {
		this.handlers = handlers;
	}
	public UserOpenIdDao getUserOpenIdDao() {
		return userOpenIdDao;
	}
	public void setUserOpenIdDao(UserOpenIdDao userOpenIdDao) {
		this.userOpenIdDao = userOpenIdDao;
	}
	public UserDao getUserDao() {
		return userDao;
	}
	public void setUserDao(UserDao userDao) {
		this.userDao = userDao;
	}
	public long getExpriesWithOpenId() {
		return expriesWithOpenId;
	}
	public void setExpriesWithOpenId(long expriesWithOpenId) {
		this.expriesWithOpenId = expriesWithOpenId;
	}
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	@Get
	@Path("/validCode")
	public AuthLoginResponse validCode(@JdbcConn Connection con, String code, String state) throws SQLException, JfwBaseException {
		OAuthHandler oah = this.handlers.get(state);
		if (oah == null)
			throw new IllegalArgumentException("非法的参数{state=" + state);
		OAuthUser ou = oah.login(code);
		UserOpenId uoi = this.userOpenIdDao.queryByOpenid(con, oah.getType(), ou.getOpenId());
		StateCode<OAuthUser, UserOpenId> sc = new StateCode<OAuthUser, UserOpenId>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
		sc.setKey(ou);
		sc.setValue(uoi);
		sc.setBuildTime(System.currentTimeMillis());
		sc.setExpiredTime(sc.getBuildTime() + this.expriesWithOpenId);
		JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
			@Override
			public void run() {
				JfwAppContext.removeCachedObject(key);
			}
		}, this.expriesWithOpenId, TimeUnit.MILLISECONDS);
		AuthLoginResponse alr = new AuthLoginResponse();
		alr.setAssociated(null != uoi);
		alr.setAuthCode(key);
		return alr;
	}
	@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 authCode) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<OAuthUser, UserOpenId> sc = (StateCode<OAuthUser, UserOpenId>) JfwAppContext.getCachedObject(authCode);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
			throw new JfwBaseException(-1, "authCode is expired");
		if (null == sc.getValue())
			throw new JfwBaseException(-2, "authCode is invalid openid not associate local user");
		User user = this.userDao.query(con, sc.getValue().getUserid());
		if (null == user)
			return null;
		
		JfwAppContext.removeCachedObject(authCode);
		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());
		}
		ret.setMobilePhone(user.getMobilePhone());
		ret.setType(user.getUserType());
		ret.setEmail(user.getEmail());
		ret.setAuth(true);
		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\")" })
	@Post
	@Path("/openidLogin")
	public SessionUser openidLogin(@JdbcConn Connection con, String openid, String oauthType) throws SQLException, JfwBaseException {
		if (null == this.handlers.get(oauthType)) {
			throw new JfwBaseException(-1, "invalid oauthType");
		}
		UserOpenId uoi = this.userOpenIdDao.queryByOpenid(con, oauthType, openid);
		if (uoi != null) {
			User user = this.userDao.query(con, uoi.getUserid());
			if (user != 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());
				}
				ret.setMobilePhone(user.getMobilePhone());
				ret.setType(user.getUserType());
				ret.setEmail(user.getEmail());
				ret.setAuth(true);
				return ret;
			}
		}
		return null;
	}
	@Post
	@Path("/associate")
	public void associate(@JdbcConn(false) Connection con, String userid, String openid, String oauthType) throws SQLException, JfwBaseException {
		if (null == this.handlers.get(oauthType)) {
			throw new JfwBaseException(-1, "invalid oauthType");
		}
		UserOpenId uoi = new UserOpenId();
		uoi.setOauthType(oauthType);
		uoi.setUserid(userid);
		uoi.setOpenid(openid);
		try {
			userOpenIdDao.insert(con, uoi);
			con.commit();
		} catch (SQLException e) {
			if ("23505".equals(e.getSQLState())) {
				try {
					con.rollback();
				} catch (Throwable th) {
				}
				throw new JfwBaseException(-2, "duplicate associate");
			} else {
				throw e;
			}
		}
	}
	
	
	
	@Post
	@Path("/checkAssociated")
	public boolean associcated(@JdbcConn(false) Connection con,String userid,String oauthType)throws SQLException,JfwBaseException{
		if (null == this.handlers.get(oauthType)) {
			throw new JfwBaseException(-1, "invalid oauthType");
		}
		return userOpenIdDao.queryByUserid(con, oauthType, userid)!=null;
	}
	@Post
	@Path("/validOpenid")
	public AuthLoginResponse validOpenid(@JdbcConn Connection con, String authType, String openid) throws SQLException, JfwBaseException {
		OAuthUser ou = new OAuthUser();
		ou.setType(authType);
		ou.setOpenId(openid);
		UserOpenId uoi = this.userOpenIdDao.queryByOpenid(con, authType, openid);
		AuthLoginResponse alr = new AuthLoginResponse();
		StateCode<OAuthUser, UserOpenId> sc = new StateCode<OAuthUser, UserOpenId>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
		sc.setKey(ou);
		sc.setValue(uoi);
		sc.setBuildTime(System.currentTimeMillis());
		sc.setExpiredTime(sc.getBuildTime() + this.expriesWithOpenId);
		JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
			@Override
			public void run() {
				JfwAppContext.removeCachedObject(key);
			}
		}, this.expriesWithOpenId, TimeUnit.MILLISECONDS);
		alr.setAssociated(null != uoi);
		alr.setAuthCode(key);
		return alr;
	}
	@Get
	@Path("/redirectUris")
	public Map<String, String> getRedirectUris() {
		Map<String, String> ret = new HashMap<String, String>();
		for (Map.Entry<String, OAuthHandler> h : this.handlers.entrySet()) {
			ret.put(h.getKey(), h.getValue().getLoginUrl());
		}
		return ret;
	}
	public static class AuthLoginResponse {
		private boolean associated;
		private String authCode;
		public boolean isAssociated() {
			return associated;
		}
		public void setAssociated(boolean associated) {
			this.associated = associated;
		}
		public String getAuthCode() {
			return authCode;
		}
		public void setAuthCode(String authCode) {
			this.authCode = authCode;
		}
	}
}

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

@@ -31,12 +31,16 @@ import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgUserDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.dao.UserOpenIdDao;
import com.ekexiu.portal.mail.MailService;
import com.ekexiu.portal.mobile.MobilePhoneService;
import com.ekexiu.portal.oauth.OAuthService;
import com.ekexiu.portal.oauth.OAuthUser;
import com.ekexiu.portal.po.OrgUser;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.po.UserOpenId;
import com.ekexiu.portal.pojo.SessionUser;
@Path
@@ -65,15 +69,19 @@ public class SysService {
	private GrowthLogService growthLogService;
	@Autowrie
	private GrowthRuleService rule;
	@Autowrie
	private OAuthService oauthService;
	@Autowrie
	private UserOpenIdDao userOpenIdDao;
	private String bindMailSubject;
	private String bindMailReplaceKey;
	private String bindMailReplaceContentTempalte;
	private long timeLimitWithBindMail = 10 * 60 * 1000;
	
	private String bindOrgMailReplaceKey; 
	private String bindOrgMailSubject; 
	private String bindOrgMailReplaceKey;
	private String bindOrgMailSubject;
	private String bindOrgMailReplaceContentTempalte;
	private long timeLimitWithBindOrgMail = 10 * 60 * 1000;
@@ -81,12 +89,12 @@ public class SysService {
	private String regMailReplaceKey;
	private String regMailReplaceContentTempalte;
	private long timeLimitWithRegMail = 10 * 60 * 1000;
	
	private String orgRegMailSubject = "注册[科袖网]企业用户";
	private String orgRegMailReplaceKey;
	private String orgRegMailReplaceContentTempalte;
	private long timeLimitWithOrgRegMail = 10 * 60 * 1000;
	
	private String sendConsultMailSubject;
	private String sendConsultMailContentTemplate;
	private String sendConsultSMSContentTemplate;
@@ -103,7 +111,7 @@ public class SysService {
	private String mailRetrievePasswordReplaceKey;
	private String mailRetrievePasswordSubject;
	private long timeLimitWithMailRetrivePassword = 10 * 60 * 1000;
	
	private String orgMailRetrievePasswordContentTemplate;
	private String orgMailRetrievePasswordReplaceKey;
	private String orgMailRetrievePasswordSubject;
@@ -112,7 +120,7 @@ public class SysService {
	private String regMobilePhoneReplaceKey;
	private String regMobilePhoneContentTemplate;
	private long timeLimitWithRegMobilePhone = 3 * 60 * 1000;
	
	private String loginMobilePhoneReplaceKey;
	private String loginMobilePhoneContentTemplate;
	private long timeLimitWithLoginMobilePhone = 3 * 60 * 1000;
@@ -124,12 +132,12 @@ public class SysService {
	private String inviteReplaceCode = "invitCodeKey";
	private String inviteMailSubject = "[ 科袖网 ]特邀科研专家邀请函";
	private String inviteMailContentTempalte;
	
	private String inviteStaffReplaceKey = "stateCode";
	private String inviteStaffMailTempalte;
	private String inviteStaffOrgKey = "orgKey";
	private String inviteStaffSubject = "[ 科袖网 ]企业员工邀请函";
	
	private String retrieveOrgSuccessTempalte;
	private String retrieveOrgSuccessSubject;
	private String retrieveOrgFailTempalte;
@@ -647,6 +655,22 @@ public class SysService {
		this.retrieveOrgFailSubject = retrieveOrgFailSubject;
	}
	public OAuthService getOauthService() {
		return oauthService;
	}
	public void setOauthService(OAuthService oauthService) {
		this.oauthService = oauthService;
	}
	public UserOpenIdDao getUserOpenIdDao() {
		return userOpenIdDao;
	}
	public void setUserOpenIdDao(UserOpenIdDao userOpenIdDao) {
		this.userOpenIdDao = userOpenIdDao;
	}
	/**
	 * 验证注册时填写的手机号和邮箱是否已经注册过
	 * 
@@ -666,34 +690,34 @@ public class SysService {
			return true;
		}
	}
	
	@Get
	@Path("/isRegOrg")
	public boolean isRegOrg(@JdbcConn Connection con,String email)throws SQLException{
	public boolean isRegOrg(@JdbcConn Connection con, String email) throws SQLException {
		OrgUser orgUser = this.orgUserDao.queryByEmail(con, email);
		if(null != orgUser){
		if (null != orgUser) {
			return false;
		}else{
		} else {
			return true;
		}
	}
	
	@Get
	@Path("/isOrgUser")
	public boolean isOrgUser(@JdbcConn Connection con,String orgName)throws SQLException, JfwBaseException{
	public boolean isOrgUser(@JdbcConn Connection con, String orgName) throws SQLException, JfwBaseException {
		String orgId = this.orgDao.queryByName(con, orgName);
		if(orgId == null){
		if (orgId == null) {
			return true;
		}else{
			if(this.orgUserDao.queryOne(con, orgId) == null){
		} else {
			if (this.orgUserDao.queryOne(con, orgId) == null) {
				return true;
			}else{
			} else {
				String authStatus = (this.orgDao.query(con, orgId)).getAuthStatus();
				if("3".equals(authStatus)){
				if ("3".equals(authStatus)) {
					throw new JfwBaseException(3, "该企业为科袖认证企业");
				}else if("2".equals(authStatus)){
				} else if ("2".equals(authStatus)) {
					throw new JfwBaseException(4, "该企业正在进行认证审核");
				}else{
				} else {
					throw new JfwBaseException(2, "该企业已注册科袖账号");
				}
			}
@@ -729,8 +753,7 @@ public class SysService {
	 */
	@Post
	@Path("/regmobile")
	public String regMobile(@JdbcConn(true) Connection con, String state, String mobilePhone, String validateCode, 
			String password, @Nullable String inviterId)throws SQLException, JfwBaseException {
	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);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
@@ -748,10 +771,10 @@ public class SysService {
			user.setMobilePhone(mobilePhone);
			user.setPasswd(passwd);
			user.setUserType("0");
	        user.setInviterId(inviterId);
	        user.setActiveTime(DATE.format(new Date()));
			user.setInviterId(inviterId);
			user.setActiveTime(DATE.format(new Date()));
			this.userDao.insert(con, user);
			if(inviterId != null){
			if (inviterId != null) {
				this.growthLogService.invite(con, inviterId, user.getId());
			}
			return user.getId();
@@ -759,11 +782,58 @@ public class SysService {
			JfwAppContext.removeCachedObject(state);
		}
	}
	
	private void associatedOpenId(Connection con, User user, String oauthType, String openid, String authCode) throws SQLException, JfwBaseException {
		if (oauthType != null) {
			if (oauthService.getHandlers().get(oauthType) == null) {
				throw new JfwBaseException(-4, "invalid oautyType");
			}
			if (openid != null) {
				UserOpenId uoi = new UserOpenId();
				uoi.setOauthType(oauthType);
				uoi.setOpenid(openid);
				uoi.setUserid(user.getId());
				try {
					userOpenIdDao.insert(con, uoi);
				} catch (SQLException e) {
					if ("23505".equals(e.getSQLState())) {
						throw new JfwBaseException(-6, "associated openid");
					}
					throw e;
				}
			} else {
				throw new JfwBaseException(-5, "关链第三方登录时,OPENID不可都为空");
			}
		} else if (null != authCode) {
			@SuppressWarnings("unchecked")
			StateCode<OAuthUser, UserOpenId> ac = (StateCode<OAuthUser, UserOpenId>) JfwAppContext.getCachedObject(authCode);
			if (ac == null || ac.getExpiredTime() < System.currentTimeMillis())
				throw new JfwBaseException(-7, "authCode is expired");
			OAuthUser ou = ac.getKey();
			openid = ou.getOpenId();
			oauthType = ou.getType();
			UserOpenId uoi = new UserOpenId();
			uoi.setOauthType(oauthType);
			uoi.setOpenid(openid);
			uoi.setUserid(user.getId());
			try {
				userOpenIdDao.insert(con, uoi);
				JfwAppContext.removeCachedObject(authCode);
			} catch (SQLException e) {
				if ("23505".equals(e.getSQLState())) {
					throw new JfwBaseException(-8, "associated openid");
				}
				throw e;
			}
		}
	}
	@Post
	@Path("/mobileReg")
	public String mobileReg(@JdbcConn(true) Connection con, String state, String mobilePhone, String validateCode, 
			String password, @Nullable String inviterId, String name)throws SQLException, JfwBaseException, IOException {
	public String mobileReg(@JdbcConn(true) Connection con, String state, String mobilePhone, String validateCode, String password, @Nullable String inviterId,
			String name,	@Nullable String oauthType, @Nullable String openid, @Nullable String authCode) throws SQLException, JfwBaseException, IOException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
@@ -781,15 +851,17 @@ public class SysService {
			user.setMobilePhone(mobilePhone);
			user.setPasswd(passwd);
			user.setUserType("0");
	        user.setInviterId(inviterId);
	        user.setActiveTime(DATE.format(new Date()));
			user.setInviterId(inviterId);
			user.setActiveTime(DATE.format(new Date()));
			this.userDao.insert(con, user);
			if(inviterId != null){
			this.associatedOpenId(con, user, oauthType, openid, authCode);
			if (inviterId != null) {
				this.growthLogService.invite(con, inviterId, user.getId());
			}
			Professor professor = new Professor();
			professor.setId(user.getId());
			professor.setName(name);
			professor.setAuthentication(-1);
			this.professorService.insert(con, professor, null);
			return user.getId();
		} finally {
@@ -827,7 +899,7 @@ public class SysService {
			user.setActiveTime(DATE.format(new Date()));
			this.userDao.insert(con, user);
			con.commit();
			if(sc.getValue() != null){
			if (sc.getValue() != null) {
				this.growthLogService.invite(con, sc.getValue(), user.getId());
			}
		} catch (SQLException e) {
@@ -843,7 +915,7 @@ public class SysService {
			JfwAppContext.removeCachedObject(key);
		}
	}
	
	@Get
	@Path("/mailReg")
	public void emailReg(@JdbcConn(false) Connection con, String key) throws SQLException, JfwBaseException, IOException {
@@ -862,12 +934,13 @@ public class SysService {
			user.setInviterId(sc.getValue());
			user.setActiveTime(DATE.format(new Date()));
			this.userDao.insert(con, user);
			if(sc.getValue() != null){
			if (sc.getValue() != null) {
				this.growthLogService.invite(con, sc.getValue(), user.getId());
			}
			Professor professor = new Professor();
			professor.setId(user.getId());
			professor.setName(sc.getDescp());
			professor.setAuthentication(-1);
			this.professorService.insert(con, professor, null);
			con.commit();
		} catch (SQLException e) {
@@ -897,7 +970,7 @@ public class SysService {
	 */
	@Post
	@Path("/regmail")
	public void regMail(@JdbcConn(false) Connection con,String mail,String password,@Nullable String inviterId)throws JfwBaseException, SQLException {
	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) {
			throw new JfwBaseException(-1, "邮箱[" + mail + "]已被注册过了");
@@ -926,10 +999,11 @@ public class SysService {
			}, this.timeLimitWithRegMail, TimeUnit.MILLISECONDS);
		}
	}
	
	@Post
	@Path("/emailReg")
	public void emailReg(@JdbcConn(false) Connection con,String mail,String password,@Nullable String inviterId,String name)throws JfwBaseException, SQLException {
	public void emailReg(@JdbcConn(false) Connection con, String mail, String password, @Nullable String inviterId, String name)
			throws JfwBaseException, SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mail);
		if (null != user) {
			throw new JfwBaseException(-1, "邮箱[" + mail + "]已被注册过了");
@@ -959,11 +1033,13 @@ public class SysService {
			}, this.timeLimitWithRegMail, TimeUnit.MILLISECONDS);
		}
	}
	
	/**
	 * 验证企业邮箱并注册企业账号
	 * 
	 * @param con
	 * @param key 邮箱验证的返回值
	 * @param key
	 *            邮箱验证的返回值
	 * @throws SQLException
	 * @throws JfwBaseException
	 * @throws IOException
@@ -977,15 +1053,15 @@ public class SysService {
			throw new JfwBaseException(-1, "验证链接已失效");
		}
		String orgId = this.orgDao.queryByName(con, sc.getValue());
		if((orgId != null) && (this.orgUserDao.queryOne(con, orgId)!= null)){
		if ((orgId != null) && (this.orgUserDao.queryOne(con, orgId) != null)) {
			throw new JfwBaseException(2, "该企业已注册科袖账号");
		}
		try {
			OrgUser orgUser = new OrgUser();
			orgUser.setEmail(sc.getCode());
			if(orgId != null){
			if (orgId != null) {
				orgUser.setId(orgId);
			}else{
			} else {
				orgUser.setId(this.orgService.createOrganization(con, sc.getValue()));
			}
			orgUser.setPasswd(StringUtil.md5(sc.getKey()));
@@ -1006,19 +1082,23 @@ public class SysService {
			JfwAppContext.removeCachedObject(key);
		}
	}
	
	/**
	 * 给注册的企业邮箱发送验证邮件
	 * 
	 * @param con
	 * @param orgName 企业名称
	 * @param mail 企业邮箱
	 * @param password 密码
	 * @param orgName
	 *            企业名称
	 * @param mail
	 *            企业邮箱
	 * @param password
	 *            密码
	 * @throws JfwBaseException
	 * @throws SQLException
	 */
	@Post
	@Path("/regOrgMail")
	public void regOrgMail(@JdbcConn(false) Connection con,String orgName,String mail,String password)throws JfwBaseException, SQLException {
	public void regOrgMail(@JdbcConn(false) Connection con, String orgName, String mail, String password) throws JfwBaseException, SQLException {
		OrgUser orgUser = this.orgUserDao.queryByEmail(con, mail);
		if (null != orgUser) {
			throw new JfwBaseException(-1, "邮箱[" + mail + "]已被注册过了");
@@ -1074,17 +1154,17 @@ public class SysService {
		this.mailservice.sendSimpleMail(user.getEmail(), mailContent, null, this.inviteMailSubject);
		return "send success !";
	}
	
	@Post
	@Path("/inviteStaff/{key}")
	public Map<String, String> inviteStaff(@JdbcConn Connection con,@PathVar String key)throws SQLException, JfwBaseException{
	public Map<String, String> inviteStaff(@JdbcConn Connection con, @PathVar String key) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(key);
		if(sc == null){
		if (sc == null) {
			throw new JfwBaseException(-1, "验证链接已失效");
		}
		Organization org = this.orgDao.query(con, sc.getKey());
		if(org == null){
		if (org == null) {
			throw new JfwBaseException(-2, "不存在的企业");
		}
		Map<String, String> map = new HashMap<String, String>();
@@ -1092,16 +1172,17 @@ public class SysService {
		map.put("orgName", org.getName());
		map.put("email", sc.getValue());
		return map;
		
	}
	
	@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("/regInviteStaff")
	@SuppressWarnings("unchecked")
	public SessionUser regInviteStaff(@JdbcConn(true) Connection con,String key,String state,String phone,String validateCode,String name,String passwd)throws SQLException, JfwBaseException{
	public SessionUser regInviteStaff(@JdbcConn(true) Connection con, String key, String state, String phone, String validateCode, String name, String passwd)
			throws SQLException, JfwBaseException {
		StateCode<String, String> stateCode = (StateCode<String, String>) JfwAppContext.getCachedObject(key);
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (stateCode == null) {
@@ -1124,22 +1205,22 @@ public class SysService {
			user.setEmail(stateCode.getValue());
			user.setPasswd(StringUtil.md5(passwd));
			user.setUserType("0");
	        user.setActiveTime(DATE.format(new Date()));
	        this.userDao.insert(con, user);
	        Professor professor = new Professor();
	        professor.setId(id);
	        professor.setName(name);
	        professor.setOrgId(stateCode.getKey());
	        professor.setOrgAuth("1");
			user.setActiveTime(DATE.format(new Date()));
			this.userDao.insert(con, user);
			Professor professor = new Professor();
			professor.setId(id);
			professor.setName(name);
			professor.setOrgId(stateCode.getKey());
			professor.setOrgAuth("1");
			professor.setPhone(user.getMobilePhone());
			professor.setEmail(user.getEmail());
			int value = 0;
			if(user.getMobilePhone() != null && user.getMobilePhone().trim().length() == 11){
			if (user.getMobilePhone() != null && user.getMobilePhone().trim().length() == 11) {
				professor.setPhone(user.getMobilePhone());
				value = value + this.rule.getBindMobile();
				this.growthLogService.firstBindMobile(con, professor.getId());
			}
			if(user.getEmail() != null && !"".equals(user.getEmail())){
			if (user.getEmail() != null && !"".equals(user.getEmail())) {
				professor.setEmail(user.getEmail());
				value = value + this.rule.getBindEmail();
				this.growthLogService.firstBindEmail(con, professor.getId());
@@ -1160,12 +1241,12 @@ public class SysService {
			JfwAppContext.removeCachedObject(state);
		}
	}
	
	@Get
	@Path("/inviteStaffMail")
	public boolean inviteStaffMail(@JdbcConn(false) Connection con,String orgId,String mail) throws SQLException, JfwBaseException {
	public boolean inviteStaffMail(@JdbcConn(false) Connection con, String orgId, String mail) throws SQLException, JfwBaseException {
		Organization org = this.orgDao.query(con, orgId);
		if(org == null){
		if (org == null) {
			throw new JfwBaseException(-1, "系统没有该企业");
		}
		StateCode<String, String> sc = new StateCode<String, String>();
@@ -1185,10 +1266,10 @@ public class SysService {
		sc.setCode(org.getName());
		return true;
	}
	
	@Post
	@Path("/retrieveOrgSuccess")
	public boolean retrieveOrgUserSuccess(@JdbcConn(false) Connection con,String mail) throws SQLException, JfwBaseException {
	public boolean retrieveOrgUserSuccess(@JdbcConn(false) Connection con, String mail) throws SQLException, JfwBaseException {
		try {
			this.mailservice.sendSimpleMail(mail, this.retrieveOrgSuccessTempalte, null, this.retrieveOrgSuccessSubject);
		} catch (MessagingException e) {
@@ -1196,10 +1277,10 @@ public class SysService {
		}
		return true;
	}
	
	@Post
	@Path("/retrieveOrgFail")
	public boolean retrieveOrgUserFail(@JdbcConn(false) Connection con,String mail) throws SQLException, JfwBaseException {
	public boolean retrieveOrgUserFail(@JdbcConn(false) Connection con, String mail) throws SQLException, JfwBaseException {
		try {
			this.mailservice.sendSimpleMail(mail, this.retrieveOrgFailTempalte, null, this.retrieveOrgFailSubject);
		} catch (MessagingException e) {
@@ -1280,16 +1361,16 @@ public class SysService {
		ret.setAuth(true);
		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\")" })
	@Post
	@Path("/mobileLogin")
	public SessionUser mobileLogin(@JdbcConn Connection con,String state,String mobilePhone,String validateCode)throws SQLException, JfwBaseException {
	public SessionUser mobileLogin(@JdbcConn Connection con, String state, String mobilePhone, String validateCode) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis()){
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis()) {
			throw new JfwBaseException(-1, "验证超时");
		}
		if (!sc.getKey().equals(mobilePhone)) {
@@ -1299,7 +1380,7 @@ public class SysService {
			throw new JfwBaseException(-3, "验证码错误");
		}
		User user = userDao.queryByEmailOrMobilePhone(con, mobilePhone);
		if (null == user){
		if (null == user) {
			throw new JfwBaseException(-4, "该用户还未注册");
		}
		try {
@@ -1318,9 +1399,9 @@ public class SysService {
			JfwAppContext.removeCachedObject(state);
		}
	}
	
	@SetCookie(checkResultNull = true, path = "/", value = { "orgId=result.getId()", "orgType=result.getType()",
			"orgAuth=String.valueOf(result.isAuth())", "orgEmail=result.getEmail()==null?\"\":result.getEmail()",
	@SetCookie(checkResultNull = true, path = "/", value = { "orgId=result.getId()", "orgType=result.getType()", "orgAuth=String.valueOf(result.isAuth())",
			"orgEmail=result.getEmail()==null?\"\":result.getEmail()",
			"orgName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/orgLogin")
@@ -1334,7 +1415,7 @@ public class SysService {
		SessionUser ret = new SessionUser();
		ret.setId(orgUser.getId());
		Organization org = this.orgDao.query(con, orgUser.getId());
		if(org != null){
		if (org != null) {
			ret.setName(org.getName());
		}
		ret.setType(orgUser.getUserType());
@@ -1342,7 +1423,7 @@ public class SysService {
		ret.setAuth(true);
		return ret;
	}
	
	@Post
	@Path("/cp")
	public boolean changePw(@JdbcConn(true) Connection con, String id, String npw, @Nullable String onw) throws SQLException {
@@ -1352,7 +1433,7 @@ public class SysService {
			return this.userDao.updatePasswd(con, StringUtil.md5(npw), id, StringUtil.md5(onw)) > 0;
		}
	}
	
	@Post
	@Path("/cpOrg")
	public boolean changeOrgPw(@JdbcConn(true) Connection con, String id, String npw, String onw) throws SQLException {
@@ -1413,7 +1494,7 @@ public class SysService {
			JfwAppContext.removeCachedObject(key);
		}
	}
	
	@Get
	@Path("/reqBindOrgMail")
	public boolean reqBindOrgMail(@JdbcConn(false) Connection con, String id, String mail) throws JfwBaseException, SQLException {
@@ -1446,13 +1527,13 @@ public class SysService {
		}
		return true;
	}
	
	@Get
	@Path("/bindOrgMail/{key}")
	public String bindOrgMail(@JdbcConn(true) Connection con, @PathVar String key) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(key);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis()){
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis()) {
			throw new JfwBaseException(-1, "验证链接已失效");
		}
		try {
@@ -1462,7 +1543,7 @@ public class SysService {
			JfwAppContext.removeCachedObject(key);
		}
	}
	
	@Get
	@Path("/vcWithBind")
	public String reqBindBindMobilePhone(@JdbcConn(false) Connection con, String userid, String mobilePhone) throws JfwBaseException, SQLException {
@@ -1504,8 +1585,10 @@ public class SysService {
	/**
	 * 发送手机验证码
	 * 
	 * @param con
	 * @param mobilePhone 验证的手机号
	 * @param mobilePhone
	 *            验证的手机号
	 * @return
	 * @throws JfwBaseException
	 * @throws SQLException
@@ -1542,7 +1625,7 @@ public class SysService {
		}
		return key;
	}
	
	@Get
	@Path("/sendMobileForLogin")
	public String sendMobileForLogin(@JdbcConn(false) Connection con, String mobilePhone) throws JfwBaseException, SQLException {
@@ -1747,7 +1830,7 @@ public class SysService {
			JfwAppContext.removeCachedObject(state);
		}
	}
	
	@Get
	@Path("/resetWithOrgEmail")
	public boolean resetWithOrgEmail(@JdbcConn(false) Connection con, String mail) throws JfwBaseException, SQLException {
@@ -1795,30 +1878,36 @@ public class SysService {
			JfwAppContext.removeCachedObject(state);
		}
	}
	
	/**
	 * 给指定邮箱发送邀请邮件
	 * 
	 * @param con
	 * @param mobilePhones 手机号数组
	 * @param emails 邮箱
	 * @param inviteCodes 邀请码
	 * @param mobilePhones
	 *            手机号数组
	 * @param emails
	 *            邮箱
	 * @param inviteCodes
	 *            邀请码
	 * @throws SQLException
	 * @throws MessagingException
	 */
	@Post
	@Path("/sendmail")
	public int sendmail(@JdbcConn Connection con,@Nullable String[] mobilePhones,String[] emails,String[] inviteCodes) throws SQLException, MessagingException{
		for (int i = 0; i < emails.length; i++){
			if(mobilePhones[i] == ""){
	public int sendmail(@JdbcConn Connection con, @Nullable String[] mobilePhones, String[] emails, String[] inviteCodes)
			throws SQLException, MessagingException {
		for (int i = 0; i < emails.length; i++) {
			if (mobilePhones[i] == "") {
				mobilePhones[i] = null;
			}
			this.sendInviteMail(con, emails[i], mobilePhones[i], inviteCodes[i]);
			this.logger.info("成功发送邀请邮件:"+emails[i]);
			this.logger.info("成功发送邀请邮件:" + emails[i]);
		}
		return emails.length;
	}
	
	public void sendInviteMail(@JdbcConn Connection con,String email,@Nullable String mobilePhone,String inviteCode)throws SQLException, MessagingException{
	public void sendInviteMail(@JdbcConn Connection con, String email, @Nullable String mobilePhone, String inviteCode)
			throws SQLException, MessagingException {
		String mailContent = this.inviteMailContentTempalte;
		mailContent = mailContent.replaceAll(this.inviteReplaceEmail, email);
		mailContent = mailContent.replaceAll(this.inviteReplaceCode, inviteCode);
@@ -1831,23 +1920,23 @@ public class SysService {
		mailContent = mailContent.replaceAll(this.inviteReplacePhone, phoneReplace);
		this.mailservice.sendSimpleMail(email, mailContent, null, this.inviteMailSubject);
	}
	
	public void sendConsultMail(String mail) throws SQLException, JfwBaseException{
	public void sendConsultMail(String mail) throws SQLException, JfwBaseException {
		try {
			mailservice.sendSimpleMail(mail, this.sendConsultMailContentTemplate, null, this.sendConsultMailSubject);
		} catch (Exception e) {
			throw new JfwBaseException(10011, "send mail to " + mail + " error", e);
		}
	}
	
	public void sendConsultSMS(String mobilePhone) throws SQLException, JfwBaseException{
	public void sendConsultSMS(String mobilePhone) throws SQLException, JfwBaseException {
		try {
			this.mobilePhoneServcie.sendMarketMessage(mobilePhone, this.sendConsultSMSContentTemplate);
		} catch (Exception e) {
			throw new JfwBaseException(10012, "send mobile phone message to " + mobilePhone + " error", e);
		}
	}
	
	public static void main(String[] args) {
		System.out.println(String.format("%04d", new Random().nextInt(10000)));
	}

src/main/resources/project-test-dev.properties

@@ -266,3 +266,7 @@ com_ekexiu_portal_service_GrowthRuleService.signInThreeDays::int=7
com_ekexiu_portal_service_GrowthRuleService.signInFourDays::int=8
com_ekexiu_portal_service_GrowthRuleService.signInFiveDays::int=9
com_ekexiu_portal_service_GrowthRuleService.signInSixDays::int=10
com_ekexiu_portal_oauth_OAuthService.handlers-ref=oauthService_handlers
oauthService_handlers::map=java.util.HashMap
oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler

src/main/resources/project-test.properties

@@ -266,3 +266,7 @@ com_ekexiu_portal_service_GrowthRuleService.signInThreeDays::int=7
com_ekexiu_portal_service_GrowthRuleService.signInFourDays::int=8
com_ekexiu_portal_service_GrowthRuleService.signInFiveDays::int=9
com_ekexiu_portal_service_GrowthRuleService.signInSixDays::int=10
com_ekexiu_portal_oauth_OAuthService.handlers-ref=oauthService_handlers
oauthService_handlers::map=java.util.HashMap
oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler

src/main/resources/project.properties

@@ -264,3 +264,8 @@ com_ekexiu_portal_service_GrowthRuleService.signInThreeDays::int=7
com_ekexiu_portal_service_GrowthRuleService.signInFourDays::int=8
com_ekexiu_portal_service_GrowthRuleService.signInFiveDays::int=9
com_ekexiu_portal_service_GrowthRuleService.signInSixDays::int=10
com_ekexiu_portal_oauth_OAuthService.handlers-ref=oauthService_handlers
oauthService_handlers::map=java.util.HashMap
oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler