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

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

@@ -1804,7 +1804,10 @@ 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,String vcode,@SessionVal(value="verification",remove=true) String scode) throws JfwBaseException, SQLException {
		if(!vcode.toUpperCase().equals(scode)){
			throw new JfwBaseException(20001, "valid code error");
		}
		User user = this.userDao.query(con, userid);
		if (null == user)
			return null;
@@ -1889,56 +1892,13 @@ 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;
//	}
	
	
	@Get
	@Path("/phoneValidCode")
	public String phoneValidCode(String phone) throws JfwBaseException{
	public String phoneValidCode(String phone,String vcode,@SessionVal(value="verification",remove=true)String scode) throws JfwBaseException{
		if(!vcode.toUpperCase().equals(scode)){
			throw new JfwBaseException(20001, "valid code error");
		}
		StateCode<String, String> sc = new StateCode<String, String>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
		try {

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

@@ -11,6 +11,7 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,7 +57,6 @@ public class PushService {
	private static Map<String, String> ERR_MAP = new HashMap<String, String>();
	final static char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
	// UiIGJTfKNR8oXb8apYdGh3
	private String secret = "U96j677DHoA1Pv5X0mxMU9";
	private String appKey = "48nq7d7yHu8dgbzVHuisp6";
	private String appId = "TUdvbnxu1c97r6Fb6cUy57";
@@ -125,24 +125,22 @@ public class PushService {
		}
	}
	private void checkResult(Map<String, Object> ret) {
		Object obj = ret.get("result");
		if ("ok".equals(obj))
			return;
	private void raiseGeTuiError(Object obj){
		String errMsg = null;
		errMsg = ERR_MAP.get(obj);
		if (errMsg == null)
			errMsg = "其他错误";
		log.error("调用用个推restApi,返回结果错误：" + obj + ":" + errMsg);
		throw new RuntimeException("调用用个推restApi,返回结果错误：" + obj + ":" + errMsg);
	}
	private void checkResult(Map<String, Object> ret) {
		Object obj = ret.get("result");
		if (!"ok".equals(obj)){
			raiseGeTuiError(obj);
		}
	}
	
//	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();
@@ -243,6 +241,23 @@ public class PushService {
		}
	}
	
	
	@Get
	@Path("/token")
	public String getToken(){
		String ret = this.token;
		if(ret!=null){
			int len = ret.length();
			Random random = new Random();
			int idx = random.nextInt(len-1);
			if(idx<1 || idx >=len){
				return ret;
			}
			return ret.substring(idx)+ret.substring(0,idx)+"_"+idx;
		}
		return null;
	}
	
	@Path("/bindTags")
	@Post
	public boolean bindTags(String[] tags, String cid) {
@@ -259,22 +274,6 @@ public class PushService {
			return false;
		}
	}
	@Path("/applyBadge")
	@Get
	public void applyBadge(int badge,String cid,String devtoken){
		String url = "https://restapi.getui.com/v1/" + this.appId + "/set_badge";
		StringBuilder sb = new StringBuilder();
		sb.append("{\"badge\":").append(badge).append(",\"cid_list\":[\"").append(cid).append("\"],\"devicetoken_list\":[\"").append(devtoken).append("\"]}");
		System.out.println(sb.toString());
		try {
			Map<String, Object> ret = post(url, TOKEN_MAP, sb.toString().getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (IOException e) {
			log.error("apply badge error[cid:" + cid + ",devtoken:" + devtoken + "]", e);
		}
		
	}
	
	private  Map<String,Object > createIosMessage(String title,String content,String payload){
		Map<String,Object> ret = new HashMap<String,Object>();
		Map<String,Object> message= new HashMap<String,Object>();
@@ -338,8 +337,6 @@ public class PushService {
		andriodMessage.put("requestid",this.allocateRequesstId());
		iosMessage.put("requestid",this.allocateRequesstId());		
		
//		System.out.println(JsonService.toJson(andriodMessage));
//		System.out.println(JsonService.toJson(iosMessage));
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(andriodMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
@@ -401,8 +398,6 @@ public class PushService {
		iosMessage.put("requestid",this.allocateRequesstId());		
		iosMessage.put("cid",cid);
		
//		System.out.println(JsonService.toJson(androidMessage));
//		System.out.println(JsonService.toJson(iosMessage));
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
@@ -422,24 +417,39 @@ public class PushService {
		Map<String,Object> androidMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String,Object> iosMessage = this.createIosMessage(title, content, pl_str);
		androidMessage.put("requestid",this.allocateRequesstId());
		androidMessage.put("alias",alias);
		androidMessage.put("alias","A_"+alias);
		iosMessage.put("requestid",this.allocateRequesstId());		
		iosMessage.put("alias",alias);
		iosMessage.put("alias","I_"+alias);
		
//		System.out.println(JsonService.toJson(androidMessage));
//		System.out.println(JsonService.toJson(iosMessage));
		boolean  sended = false;
		Object result = null;
		Map<String,Object> ret = null;
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
			ret = post(url, TOKEN_MAP,JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
		} catch (Exception e) {
			log.error("send app message error",e);
		}
		result = ret.get("result");
		if("ok".equals(result)){
			sended=true;
		}else if(!"alias_notbind".equals(result)){
			raiseGeTuiError(result);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
			 ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
		} catch (Exception e) {
			log.error("send app message error",e);
		}	
		}
		result = ret.get("result");
		if("ok".equals(result)){
			return;
		}else if("alias_notbind".equals(result)){
			raiseGeTuiError("alias_notbind");
		}else{
			if(!sended){				
				raiseGeTuiError(result);
			}
		}
	}
	
	
@@ -529,9 +539,22 @@ public class PushService {
		PushService s = new PushService();
//		 s.buildToken();
//		 s.checkToken();
//		TOKEN_MAP.put("authtoken", "ef60d2aa2bc3193fc99a99ef43906cee70658156dfb41156acc35f7e7b7fb3dd");
		
		
	
		
		String t="44f123977f387165a8c2b77f83ce30ccad8be50a922a21a96976700dad3a5f61";
		int idx = 51;
		int len = t.length();
		idx = len-idx;
		System.out.println();
		TOKEN_MAP.put("authtoken", t.substring(idx)+t.substring(0,idx));
	long l = System.currentTimeMillis();
		s.toApp("title_" + l, "content_" + l, "payload_" + l);
		//s.toApp("title_" + l, "content_" + l, "payload_" + l);
	s.pushWithAlias("title_" + l, "content_" + l, "payload_" + l,"1A21F6D7BD4C549A1A2ABC415DE7701BD");
//	s.applyBadge(10, "f293af1f1cc043185ee9d921b63c4807", "9982595B6AAAE1EFABD0B40E215A76507E74D12477573491AF023B89807A01AA");
	System.out.println(l);
//	s.applyBadge(1, "f293af1f1cc043185ee9d921b63c4807", "D380AD6865B61F4D179DBB208EE3C7268A672AB9821385050596608A186F6023");
		// for(int i = 0 ;i < 100;++i){

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

@@ -104,7 +104,7 @@ com_ekexiu_portal_service_SysService.phoneRetrievePasswordReplaceKey=yzm
com_ekexiu_portal_service_SysService.phoneRetrievePasswordContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u5BC6\u7801\u91CD\u7F6E\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
#手机验证-注册用户
com_ekexiu_portal_service_SysService.regMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u624B\u673A\u6CE8\u518C\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u4E3Ayzm\uFF0C\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\uFF0C\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u6B64\u77ED\u4FE1\u3002
#手机验证-用户登录
com_ekexiu_portal_service_SysService.loginMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.loginMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u77ED\u4FE1\u767B\u5F55\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
@@ -273,4 +273,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=true
com_ekexiu_push_service_PushService.enable::boolean=false

src/main/resources/project-test.properties

@@ -104,7 +104,7 @@ com_ekexiu_portal_service_SysService.phoneRetrievePasswordReplaceKey=yzm
com_ekexiu_portal_service_SysService.phoneRetrievePasswordContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u5BC6\u7801\u91CD\u7F6E\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
#手机验证-注册用户
com_ekexiu_portal_service_SysService.regMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u624B\u673A\u6CE8\u518C\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u4E3Ayzm\uFF0C\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\uFF0C\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u6B64\u77ED\u4FE1\u3002
#手机验证-用户登录
com_ekexiu_portal_service_SysService.loginMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.loginMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u77ED\u4FE1\u767B\u5F55\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
@@ -273,4 +273,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
com_ekexiu_push_service_PushService.enable::boolean=true

src/main/resources/project.properties

@@ -104,7 +104,7 @@ com_ekexiu_portal_service_SysService.phoneRetrievePasswordReplaceKey=yzm
com_ekexiu_portal_service_SysService.phoneRetrievePasswordContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u5BC6\u7801\u91CD\u7F6E\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
#手机验证-注册用户
com_ekexiu_portal_service_SysService.regMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u624B\u673A\u6CE8\u518C\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u4E3Ayzm\uFF0C\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\uFF0C\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u6B64\u77ED\u4FE1\u3002
#手机验证-用户登录
com_ekexiu_portal_service_SysService.loginMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.loginMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u77ED\u4FE1\u767B\u5F55\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002