--add orgMailService config;

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

@@ -66,6 +66,11 @@ 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 bindMobilePhoneReplaceKey;
	private String bindMobilePhoneContentTemplate;
@@ -364,6 +369,38 @@ public class SysService {
		this.regMailSubject = regMailSubject;
	}
	public String getOrgRegMailSubject() {
		return orgRegMailSubject;
	}
	public void setOrgRegMailSubject(String orgRegMailSubject) {
		this.orgRegMailSubject = orgRegMailSubject;
	}
	public String getOrgRegMailReplaceKey() {
		return orgRegMailReplaceKey;
	}
	public void setOrgRegMailReplaceKey(String orgRegMailReplaceKey) {
		this.orgRegMailReplaceKey = orgRegMailReplaceKey;
	}
	public String getOrgRegMailReplaceContentTempalte() {
		return orgRegMailReplaceContentTempalte;
	}
	public void setOrgRegMailReplaceContentTempalte(String orgRegMailReplaceContentTempalte) {
		this.orgRegMailReplaceContentTempalte = orgRegMailReplaceContentTempalte;
	}
	public long getTimeLimitWithOrgRegMail() {
		return timeLimitWithOrgRegMail;
	}
	public void setTimeLimitWithOrgRegMail(long timeLimitWithOrgRegMail) {
		this.timeLimitWithOrgRegMail = timeLimitWithOrgRegMail;
	}
	/**
	 * 验证注册时填写的手机号和邮箱是否已经注册过
	 * 
@@ -582,7 +619,7 @@ public class SysService {
			user.setUserType("1");
			user.setActiveTime(DATE.format(new Date()));
			this.userDao.insert(con, user);
			this.orgDao.updateJoin(con, user.getId(), "1");
			this.orgDao.updateIsJoin(con, user.getId(), "1");
			con.commit();
		} catch (SQLException e) {
			try {
@@ -618,9 +655,9 @@ public class SysService {
			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);
			map.put(this.orgRegMailReplaceKey, key);
			try {
				this.mailservice.sendSimpleMail(mail, this.regMailReplaceContentTempalte, map, this.regMailSubject);
				this.mailservice.sendSimpleMail(mail, this.orgRegMailReplaceContentTempalte, map, this.orgRegMailSubject);
			} catch (MessagingException e) {
				JfwAppContext.removeCachedObject(key);
				throw new JfwBaseException(-2, "给邮箱[" + mail + "]发邮件错误", e);
@@ -629,13 +666,13 @@ public class SysService {
			sc.setKey(password);
			sc.setValue(orgName);
			sc.setBuildTime(System.currentTimeMillis());
			sc.setExpiredTime(sc.getBuildTime() + this.timeLimitWithRegMail);
			sc.setExpiredTime(sc.getBuildTime() + this.timeLimitWithOrgRegMail);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithRegMail, TimeUnit.MILLISECONDS);
			}, this.timeLimitWithOrgRegMail, TimeUnit.MILLISECONDS);
		}
	}