11

src/main/java/com/ekexiu/portal/msg/Service.java

@@ -27,6 +27,7 @@ import org.jfw.util.jdbc.ResultSetExtractor;
import org.jfw.util.json.JsonService;
import com.ekexiu.portal.util.WebMsgSocketServlet;
import com.ekexiu.push.service.PushService;
@Path("/webMsg")
public class Service {
@@ -37,6 +38,19 @@ public class Service {
	@Autowrie
	private WebMsgDao webMsgDao;
	
	@Autowrie
	private PushService pushService;
	
	
	public PushService getPushService() {
		return pushService;
	}
	public void setPushService(PushService pushService) {
		this.pushService = pushService;
	}
	public WebMsgDao getWebMsgDao() {
		return webMsgDao;
@@ -240,6 +254,9 @@ public class Service {
				con.commit();
				next = false;
				WebMsgSocketServlet.sendMessage(reciver, JsonService.toJson(wmc));
				try{
					pushService.pushWithAlias("通知","您收到了一条消息", "msgsend", reciver);
				}catch(Throwable thr){}
			} catch (SQLException e) {
				if ("23505".equals(e.getSQLState())) {
					con.rollback();

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

@@ -1889,51 +1889,51 @@ public class SysService {
		}
		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;
	}
//	/**
//	 * 发送手机验证码
//	 * 
//	 * @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

src/main/java/com/ekexiu/portal/util/DebugService.java

@@ -1,15 +1,44 @@
package com.ekexiu.portal.util;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import com.ekexiu.push.service.PushService;
@Path("/debug")
public class DebugService {
	@Autowrie
	private PushService pushService;
	
	
	public PushService getPushService() {
		return pushService;
	}
	public void setPushService(PushService pushService) {
		this.pushService = pushService;
	}
	@Get
	@Post
	@Path("/msg/send")
	public void sendMsg(String to,String cnt){
		WebMsgSocketServlet.sendMessage(to, cnt);
	}
	@Get
	@Post
	@Path("/push")
	public void send(@Nullable String alias,@Nullable String[] tag,String title,String cnt,@Nullable String json){
		if(alias!=null){
			pushService.pushWithAlias(title, cnt, json, alias);
		}else{
			pushService.pushWithTag(title, cnt, json, tag);
		}
		
	}
}

src/main/java/com/ekexiu/push/service/PushService.java

@@ -61,6 +61,7 @@ public class PushService {
	private String appKey = "48nq7d7yHu8dgbzVHuisp6";
	private String appId = "TUdvbnxu1c97r6Fb6cUy57";
	private int timeout = 0;
	private boolean enable = false;
	private String token = null;
	private long lastBuildTime = 0;
@@ -97,6 +98,16 @@ public class PushService {
		this.timeout = timeout;
	}
	
	
	public boolean isEnable() {
		return enable;
	}
	public void setEnable(boolean enable) {
		this.enable = enable;
	}
	private String buildSign(long flag) {
		String p = this.appKey + flag + this.secret;
		MessageDigest messageDigest;
@@ -126,12 +137,12 @@ public class PushService {
		throw new RuntimeException("调用用个推restApi,返回结果错误：" + obj + ":" + errMsg);
	}
	private void checkToken() {
		if (this.token == null) {
			log.error("token is null");
			throw new RuntimeException("token is null");
		}
	}
//	private void checkToken() {
//		if (this.token == null) {
//			log.error("token is null");
//			throw new RuntimeException("token is null");
//		}
//	}
	public String allocateRequesstId() {
		UUID uuid = UUID.randomUUID();
@@ -139,7 +150,6 @@ public class PushService {
	}
	private void buildToken() {
		if(true) return;
		long time = System.currentTimeMillis();
		String sign = this.buildSign(time);
		StringBuilder sb = new StringBuilder();
@@ -164,7 +174,7 @@ public class PushService {
		if ((this.token != null) && ((System.currentTimeMillis() - this.lastBuildTime) < (24 * 60 * 60 * 1000 - 5000))) {
			return;
		}
		this.buildToken();
		if(enable)	this.buildToken();
	}
	public Map<String, Object> post(String url, Map<String, String> header, byte[] data) throws IOException {

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

@@ -272,4 +272,5 @@ 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
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler
com_ekexiu_push_service_PushService.enable::boolean=true

src/main/resources/project-test.properties

@@ -272,4 +272,5 @@ 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
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler
com_ekexiu_push_service_PushService.enable::boolean=false

src/main/resources/project.properties

@@ -271,4 +271,4 @@ 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
com_ekexiu_push_service_PushService.enable::boolean=false