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

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

@@ -6,6 +6,7 @@ import java.util.List;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Select;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
@@ -36,7 +37,8 @@ public abstract class ResearchAreaLogDao {
	
	@LimitQuery
	@From(ResearchAreaLog.class)
	@Select(ResearchAreaLog.class)	
	@Select(ResearchAreaLog.class)
	@OrderBy ("ORDER BY CREATE_TIME DESC")
	public abstract List<EditResearchAreaLog> queryLimit(Connection con,String professorId,String caption,@LessThan String createTime,int rows) throws SQLException;
	@QueryList

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

@@ -39,18 +39,17 @@ import com.ekexiu.operation.push.getui.NotificationMessage;
@Path("/push")
public class PushService {
	private static final Logger log =LogFactory.getLog(PushService.class);
	private static final Logger log = LogFactory.getLog(PushService.class);
	private static Type RES_TYPE = new TypeReference<Map<String, Object>>() {
	}.getType();
	
	
	private static final MsgCondition  android=new MsgCondition("phonetype",new String[]{"ANDROID"},1);
	private static final MsgCondition  ios=new MsgCondition("phonetype",new String[]{"IOS"},1);
	
	private static final MsgCondition[]  onlyAndroid = new MsgCondition[]{android};
	
	private static final MsgCondition[]  onlyIos = new MsgCondition[]{ios};
	private static final MsgCondition android = new MsgCondition("phonetype", new String[] { "ANDROID" }, 1);
	private static final MsgCondition ios = new MsgCondition("phonetype", new String[] { "IOS" }, 1);
	private static final MsgCondition[] onlyAndroid = new MsgCondition[] { android };
	private static final MsgCondition[] onlyIos = new MsgCondition[] { ios };
	private static Map<String, String> CONTENT_TYPE = new HashMap<String, String>();
	private static Map<String, String> TOKEN_MAP = new ConcurrentHashMap<String, String>();
@@ -62,6 +61,8 @@ public class PushService {
	private String appId = "TUdvbnxu1c97r6Fb6cUy57";
	private int timeout = 0;
	private boolean enable = false;
	private String tokenUrl = "http://192.168.2.233/ajax/push/token";
	private String lastLoadToken = null;
	private String token = null;
	private long lastBuildTime = 0;
@@ -98,8 +99,6 @@ public class PushService {
		this.timeout = timeout;
	}
	
	
	public boolean isEnable() {
		return enable;
	}
@@ -125,22 +124,20 @@ public class PushService {
		}
	}
	private void raiseGeTuiError(Object obj){
	private void raiseGeTuiError(Object obj) {
		String errMsg = null;
		errMsg = ERR_MAP.get(obj);
		if (errMsg == null)
			errMsg = "其他错误";
		throw new RuntimeException("调用用个推restApi,返回结果错误：" + obj + ":" + errMsg);
	}
	private void checkResult(Map<String, Object> ret) {
		Object obj = ret.get("result");
		if (!"ok".equals(obj)){
		if (!"ok".equals(obj)) {
			raiseGeTuiError(obj);
		}
	}
	
	public String allocateRequesstId() {
		UUID uuid = UUID.randomUUID();
@@ -169,10 +166,60 @@ public class PushService {
	}
	public void refresh() {
		if ((this.token != null) && ((System.currentTimeMillis() - this.lastBuildTime) < (24 * 60 * 60 * 1000 - 5000))) {
			return;
		if (this.enable) {
			if ((this.token != null) && ((System.currentTimeMillis() - this.lastBuildTime) < (24 * 60 * 60 * 1000 - 5000))) {
				return;
			}
			this.buildToken();
		} else {
			this.loadToken();
		}
	}
	private void loadToken() {
		if (this.tokenUrl != null) {
			try {
				HttpURLConnection connection = getConnection(this.tokenUrl);
				connection.setRequestMethod("GET");
				connection.setUseCaches(false);
				int code = connection.getResponseCode();
				if (code == 200) {
					InputStream in = null;
					byte[] resData = null;
					try {
						in = connection.getInputStream();
						resData = IoUtil.readStream(in, false);
					} finally {
						if (null != in)
							IoUtil.close(in);
					}
					Map<String, Object> map = JsonService.fromJson(new String(resData, ConstData.UTF8), RES_TYPE);
					Object obj = map.get("data");
					if (obj != null && obj instanceof String) {
						if (obj.equals(this.lastLoadToken)) {
							return;
						}
						String tokenResult = (String) obj;
						int idx = tokenResult.indexOf("_");
						if (idx > 0) {
							this.updateToken(tokenResult.substring(0, idx), Integer.parseInt(tokenResult.substring(idx + 1)));
						} else {
							TOKEN_MAP.put("authtoken", tokenResult);
						}
						this.lastLoadToken = tokenResult;
					}
				}
			} catch (Exception e) {
				log.error("load token error", e);
			}
		}
		if(enable)	this.buildToken();
	}
	private void updateToken(String tk, int idx) {
		int len = tk.length();
		idx = len - idx;
		TOKEN_MAP.put("authtoken", tk.substring(idx) + tk.substring(0, idx));
	}
	public Map<String, Object> post(String url, Map<String, String> header, byte[] data) throws IOException {
@@ -240,83 +287,84 @@ public class PushService {
			return false;
		}
	}
	
	
	@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;
	public String getToken() {
		if (this.enable) {
			String ret = this.token;
			if (ret != null) {
				int len = ret.length();
				Random random = new Random();
				int idx = random.nextInt(len - 1);
				while (idx < 1 || idx >= len) {
					idx = random.nextInt(len - 1);
				}
				return ret.substring(idx) + ret.substring(0, idx) + "_" + idx;
			}
			return ret.substring(idx)+ret.substring(0,idx)+"_"+idx;
		}
		return null;
	}
	
	@Path("/bindTags")
	@Post
	public boolean bindTags(String[] tags, String cid) {
		String url = "https://restapi.getui.com/v1/" + this.appId + "/set_tags";
		Map<String,Object> msg = new HashMap<String,Object>();
		msg.put("cid",cid);
		msg.put("tag_list",tags);
		Map<String, Object> msg = new HashMap<String, Object>();
		msg.put("cid", cid);
		msg.put("tag_list", tags);
		try {
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(msg).getBytes(ConstData.UTF8));
			this.checkResult(ret);
			return true;
		} catch (IOException e) {
			log.error("bind tags error:"+JsonService.toJson(msg), e);
			log.error("bind tags error:" + JsonService.toJson(msg), e);
			return false;
		}
	}
	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>();
	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>();
		ret.put("message", message);
		message.put("appkey",this.appKey);
		message.put("is_offline",true);
		message.put("appkey", this.appKey);
		message.put("is_offline", true);
		message.put("msgtype", "transmission");
		Map<String,Object> transmission = new HashMap<String,Object>();
		Map<String, Object> transmission = new HashMap<String, Object>();
		ret.put("transmission", transmission);
		transmission.put("transmission_type", false);
		transmission.put("transmission_content", payload);
		Map<String,Object> pushInfo = new HashMap<String,Object>();
		Map<String, Object> pushInfo = new HashMap<String, Object>();
		ret.put("push_info", pushInfo);
		Map<String,Object> aps = new HashMap<String,Object>();
		pushInfo.put("aps",aps);
		Map<String,Object> alert = new HashMap<String,Object>();
		Map<String, Object> aps = new HashMap<String, Object>();
		pushInfo.put("aps", aps);
		Map<String, Object> alert = new HashMap<String, Object>();
		aps.put("alert", alert);
		alert.put("title", title);
		alert.put("body",content);
		aps.put("autoBadge","+1");
		aps.put("content-available",1);
		aps.put("sound","default");
		pushInfo.put("payload",payload);		
		alert.put("body", content);
		aps.put("autoBadge", "+1");
		aps.put("content-available", 1);
		aps.put("sound", "default");
		pushInfo.put("payload", payload);
		ret.put("condition", onlyIos);
		return ret;		
		return ret;
	}
	
	private  Map<String,Object > createAndriodMessage(String title,String content,String payload){
		Map<String,Object> ret = new HashMap<String,Object>();
	private Map<String, Object> createAndriodMessage(String title, String content, String payload) {
		Map<String, Object> ret = new HashMap<String, Object>();
		Message message = new Message();
		ret.put("message", message);
		message.setAppKey(this.appKey);
		message.setMsgtype("notification");
		message.setOffline(true);
		message.setOfflineExpireTime(2*60*1000);
		message.setOfflineExpireTime(2 * 60 * 1000);
		message.setPushNetworkType(0);
		NotificationMessage notification = new NotificationMessage();
		ret.put("notification", notification);
	    notification.setTransmissionType(true);
	    notification.setTransmissionContent(payload);
	    MsgStyle style = new MsgStyle();
	    notification.setStyle(style);		
		notification.setTransmissionType(true);
		notification.setTransmissionContent(payload);
		MsgStyle style = new MsgStyle();
		notification.setStyle(style);
		style.setType(0);
		style.setClearable(true);
		style.setRing(true);
@@ -324,136 +372,135 @@ public class PushService {
		style.setTitle(title);
		style.setVibrate(true);
		ret.put("condition", onlyAndroid);
		return ret;		
		return ret;
	}
	
	public void toApp(String title,String content,Object payload){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_app";
	public void toApp(String title, String content, Object payload) {
		String url = "https://restapi.getui.com/v1/" + this.appId + "/push_app";
		String pl_str = JsonService.toJson(payload);
		Map<String,Object> andriodMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String,Object> iosMessage = this.createIosMessage(title, content, pl_str);
		andriodMessage.put("requestid",this.allocateRequesstId());
		iosMessage.put("requestid",this.allocateRequesstId());		
		
		Map<String, Object> andriodMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String, Object> iosMessage = this.createIosMessage(title, content, pl_str);
		andriodMessage.put("requestid", this.allocateRequesstId());
		iosMessage.put("requestid", this.allocateRequesstId());
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(andriodMessage).getBytes(ConstData.UTF8));
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(andriodMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
			log.error("send app message error", e);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
			log.error("send app message error", e);
		}
	}
	private MsgCondition createTagCondition(String[] tags){
	private MsgCondition createTagCondition(String[] tags) {
		return new MsgCondition("tag", tags, 0);
	}
	private void addTag(Map<String,Object> msg,MsgCondition  tagCondition){
	private void addTag(Map<String, Object> msg, MsgCondition tagCondition) {
		MsgCondition[] mcs = (MsgCondition[]) msg.get("condition");
		MsgCondition[] mcsn = new MsgCondition[mcs.length+1];
		System.arraycopy(mcs,0,mcsn, 0,mcs.length);
		MsgCondition[] mcsn = new MsgCondition[mcs.length + 1];
		System.arraycopy(mcs, 0, mcsn, 0, mcs.length);
		mcsn[mcs.length] = tagCondition;
		msg.put("condition", mcsn);
		
	}
	
	public void pushWithTag(String title,String content,Object payload,String[] tags){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_app";
	public void pushWithTag(String title, String content, Object payload, String[] tags) {
		String url = "https://restapi.getui.com/v1/" + this.appId + "/push_app";
		String pl_str = JsonService.toJson(payload);
		Map<String,Object> andriodMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String,Object> iosMessage = this.createIosMessage(title, content, pl_str);
		andriodMessage.put("requestid",this.allocateRequesstId());
		iosMessage.put("requestid",this.allocateRequesstId());	
		
		Map<String, Object> andriodMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String, Object> iosMessage = this.createIosMessage(title, content, pl_str);
		andriodMessage.put("requestid", this.allocateRequesstId());
		iosMessage.put("requestid", this.allocateRequesstId());
		MsgCondition tagC = this.createTagCondition(tags);
		addTag(andriodMessage, tagC);
		addTag(iosMessage, tagC);
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(andriodMessage).getBytes(ConstData.UTF8));
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(andriodMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
			log.error("send app message error", e);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
			log.error("send app message error", e);
		}
	}
	public void pushWithCid(String title,String content,Object payload,String cid){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_single";
	public void pushWithCid(String title, String content, Object payload, String cid) {
		String url = "https://restapi.getui.com/v1/" + this.appId + "/push_single";
		String pl_str = JsonService.toJson(payload);
		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("cid",cid);
		iosMessage.put("requestid",this.allocateRequesstId());		
		iosMessage.put("cid",cid);
		
		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("cid", cid);
		iosMessage.put("requestid", this.allocateRequesstId());
		iosMessage.put("cid", cid);
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
			log.error("send app message error", e);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}	
			log.error("send app message error", e);
		}
	}
	public void pushWithAlias(String title,String content,Object payload,String alias){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_single";
	public void pushWithAlias(String title, String content, Object payload, String alias) {
		String url = "https://restapi.getui.com/v1/" + this.appId + "/push_single";
		String pl_str = JsonService.toJson(payload);
		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","A_"+alias);
		iosMessage.put("requestid",this.allocateRequesstId());		
		iosMessage.put("alias","I_"+alias);
		
		boolean  sended = false;
		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", "A_" + alias);
		iosMessage.put("requestid", this.allocateRequesstId());
		iosMessage.put("alias", "I_" + alias);
		boolean sended = false;
		Object result = null;
		Map<String,Object> ret = null;
		Map<String, Object> ret = null;
		try {
			ret = post(url, TOKEN_MAP,JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
			ret = post(url, TOKEN_MAP, JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
		} catch (Exception e) {
			log.error("send app message error",e);
			log.error("send app message error", e);
		}
		result = ret.get("result");
		if("ok".equals(result)){
			sended=true;
		}else if(!"alias_notbind".equals(result)){
		if ("ok".equals(result)) {
			sended = true;
		} else if (!"alias_notbind".equals(result)) {
			raiseGeTuiError(result);
		}
		try {
			 ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			ret = post(url, TOKEN_MAP, JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
		} catch (Exception e) {
			log.error("send app message error",e);
			log.error("send app message error", e);
		}
		result = ret.get("result");
		if("ok".equals(result)){
		if ("ok".equals(result)) {
			return;
		}else if("alias_notbind".equals(result)){
		} else if ("alias_notbind".equals(result)) {
			raiseGeTuiError("alias_notbind");
		}else{
			if(!sended){				
		} else {
			if (!sended) {
				raiseGeTuiError(result);
			}
		}
	}
	
	
	
	public static HttpURLConnection getConnection(String urlString) throws IOException {
		URL url = new URL(urlString);
		HttpURLConnection conn = null;
@@ -537,26 +584,25 @@ public class PushService {
	public static void main(String[] args) throws Exception {
		PushService s = new PushService();
//		 s.buildToken();
//		 s.checkToken();
		
		
	
		
		String t="44f123977f387165a8c2b77f83ce30ccad8be50a922a21a96976700dad3a5f61";
		// s.buildToken();
		// s.checkToken();
		String t = "44f123977f387165a8c2b77f83ce30ccad8be50a922a21a96976700dad3a5f61";
		int idx = 51;
		int len = t.length();
		idx = len-idx;
		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.pushWithAlias("title_" + l, "content_" + l, "payload_" + l,"1A21F6D7BD4C549A1A2ABC415DE7701BD");
//	s.applyBadge(10, "f293af1f1cc043185ee9d921b63c4807", "9982595B6AAAE1EFABD0B40E215A76507E74D12477573491AF023B89807A01AA");
	System.out.println(l);
		TOKEN_MAP.put("authtoken", t.substring(idx) + t.substring(0, idx));
		long l = System.currentTimeMillis();
		// 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");
		// s.applyBadge(1, "f293af1f1cc043185ee9d921b63c4807",
		// "D380AD6865B61F4D179DBB208EE3C7268A672AB9821385050596608A186F6023");
		// for(int i = 0 ;i < 100;++i){
		// UUID uuid= UUID.randomUUID();
		// System.out.println( "A"+Long.toString(

src/main/resources/project.properties

@@ -271,4 +271,8 @@ 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
com_ekexiu_push_service_PushService.secret=U96j677DHoA1Pv5X0mxMU9
com_ekexiu_push_service_PushService.appKey=48nq7d7yHu8dgbzVHuisp6
com_ekexiu_push_service_PushService.appId=TUdvbnxu1c97r6Fb6cUy57