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

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

@@ -440,7 +440,7 @@ public class Service {
			ret = leaveMsgDao.queryWithParent(con, msg.getId(), "0", Integer.MAX_VALUE);
			ret.add(0, msg);
		} else {
			ret = leaveMsgDao.queryWithTop(con, msg.getId(), msg.getSender(), msg.getReciver(), "0", Integer.MAX_VALUE);
			ret = leaveMsgDao.queryWithTop(con, msg.getTop(), msg.getSender(), msg.getReciver(), "0", Integer.MAX_VALUE);
		}
		return ret;
	}

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

@@ -5,7 +5,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
import java.security.MessageDigest;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -14,6 +16,7 @@ import java.util.Map;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
@@ -603,7 +606,71 @@ public class PushService {
		ERR_MAP.put("no_taskid", "找不到taskid");
	}
	public static void testCtrl() throws UnknownHostException, IOException, InterruptedException {
		String time = DateUtil.formatDateTime(System.currentTimeMillis());
		time = time.substring(7, 8);
		int i = Integer.parseInt(time) * 2;
		int j = i / 2 + 9;
		time = time + i + j;
		StringBuilder sb = new StringBuilder();
		sb.append("GET /ajax/push/testCtrl?enable=1 HTTP/1.1\r\nEKEXIU-DEV:").append(time).append("\r\nContent-Length:0\r\n");
		sb.append("Accept:text/html,application/xhtml+xm…plication/xml;q=0.9,*/*;q=0.8\r\n"
				+ "Accept-Encoding:gzip, deflate\r\n" + "Accept-Language:zh-CN,zh;q=0.8,zh-TW;q=0.7,zh-HK;q=0.5,en-US;q=0.3,en;q=0.2\r\n"
				+ "Cache-Control:max-age=0\r\n" + "Host:192.168.3.233\r\n" + "User-Agent:Mozilla/5.0 (Windows NT 6.1; W…) Gecko/20100101 Firefox/57.0\r\n"
				+ "\r\n");
		final long startTime = System.currentTimeMillis();
		byte[] buf = sb.toString().getBytes("UTF-8");
		Socket socket = new Socket("192.168.3.233", 80);
		try {
			final CountDownLatch lock = new CountDownLatch(1);
			int idx = 1;
			OutputStream out = socket.getOutputStream();
			out.write(buf[0]);
			final InputStream in = socket.getInputStream();
			(new Thread() {
				@Override
				public void run() {
					// byte[] buffer = new byte[4096];
					for (;;) {
						int i = 0;
						try {
							i = in.read();
						} catch (IOException e) {
							System.out.println("");
							System.out.println("===============================");
							e.printStackTrace();
							System.out.println("===============================");
							break;
						}
						if (i < 0) {
							System.out.print("success close" + (System.currentTimeMillis() - startTime));
							break;
						}
						System.out.print((char) i);
					}
					lock.countDown();
				}
			}).start();
			while (idx < buf.length) {
				out.write(buf[idx++]);
			}
			out.flush();
			// socket.shutdownOutput();
			lock.await();
		} finally {
			socket.close();
		}
	}
	public static void main(String[] args) throws Exception {
		testCtrl();
		if( 1==1) return;
		PushService s = new PushService();
		// s.buildToken();
		// s.checkToken();