Merge remote-tracking branch 'origin/dev' into test

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

	{
		organization.setId(StringUtil.buildUUID());
		if(organization.getOrgType()== null) organization.setOrgType(this.defaultOrgType);
		if(organization.getIsJoin() == null ) organization.setIsJoin("0");
		this.orgDao.insert(con, organization);
		Organization no = this.orgDao.query(con, organization.getId());
		if(no!=null && no.getIsJoin().equals("1")){
		org.setName(orgName);
		org.setOrgType(this.defaultOrgType);
		org.setAuthStatus(this.defaultAuthStatus);
		org.setIsJoin("0");
		try {
			orgDao.insert(con, org);
			this.imageService.saveDefaultOrgLogo(id);

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

		}
		return key;
	}
	/**
	 * 发送手机验证码
	 * 
	 * @param con
	 * @param mobilePhone
	 *            验证的手机号
	 * @return
	 * @throws JfwBaseException
	 * @throws SQLException
	 */
	@Get
	@Path("/regmobilephone_onlyphone")
	public String regMobilePhone(@JdbcConn(false) Connection con, String mobilePhone, @DefaultValue("true") boolean checkExists)
			throws JfwBaseException, SQLException {
		if (checkExists) {
			User user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
			if (null != user) {
				return null;
			}
		}
		StateCode<String, String> sc = new StateCode<String, String>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
		try {
			Random rd = new Random();
			int vi = rd.nextInt(10000);
			String vc = String.format("%04d", vi);
			sc.setKey(mobilePhone);
			sc.setValue(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);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10012, "send mobile phone message to " + mobilePhone + " error", e);
		}
		return key;
	}
	
	
	@Get