Merge branch 'dev'

Author: 夜色

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.mpush</groupId>
     <artifactId>alloc</artifactId>
-    <version>0.7.1</version>
+    <version>0.8.0</version>
     <name>mpush-alloc</name>
     <description>mpush Server Allocator</description>
     <url>https://github.com/mpusher/mpush</url>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.github.mpusher</groupId>
             <artifactId>mpush-client</artifactId>
-            <version>0.7.1</version>
+            <version>0.8.0</version>
         </dependency>
     </dependencies>
 

src/main/java/com/shinemo/mpush/alloc/AllocHandler.java

@@ -47,9 +47,10 @@
  */
 /*package*/ final class AllocHandler implements HttpHandler {
 
-    private ScheduledExecutorService scheduledExecutor;
     private List<ServerNode> serverNodes = Collections.emptyList();
+    private ScheduledExecutorService scheduledExecutor;
     private final ServiceDiscovery discovery = ServiceDiscoveryFactory.create();
+    private final UserManager userManager = new UserManager(null);
 
     public void start() {
         CacheManagerFactory.create().init(); //启动缓冲服务
@@ -108,11 +109,14 @@ private void refresh() {
     }
 
     private long getOnlineUserNum(String publicIP) {
-        return UserManager.I.getOnlineUserNum(publicIP);
+        return userManager.getOnlineUserNum(publicIP);
     }
 
     private ServerNode convert(ServiceNode node) {
         String public_ip = node.getAttr(ServiceNames.ATTR_PUBLIC_IP);
+        if (public_ip == null) {
+            public_ip = node.getHost();
+        }
         long onlineUserNum = getOnlineUserNum(public_ip);
         return new ServerNode(public_ip, node.getPort(), onlineUserNum);
     }

src/main/java/com/shinemo/mpush/alloc/AllocServer.java

@@ -43,14 +43,12 @@ public final class AllocServer extends BaseService {
 
     @Override
     public void init() {
-        try {
-            int port = CC.mp.net.cfg.getInt("alloc-server-port");
-            this.httpServer = HttpServer.create(new InetSocketAddress(port), 0);
-            this.allocHandler = new AllocHandler();
-            this.pushHandler = new PushHandler();
-        } catch (IOException e) {
-            throw new ServiceException(e);
-        }
+        int port = CC.mp.net.cfg.getInt("alloc-server-port");
+        boolean https = "https".equals(CC.mp.net.cfg.getString("alloc-server-protocol"));
+
+        this.httpServer = HttpServerCreator.createServer(port, https);
+        this.allocHandler = new AllocHandler();
+        this.pushHandler = new PushHandler();
 
         httpServer.setExecutor(Executors.newCachedThreadPool());//设置线程池，由于是纯内存操作，不需要队列
         httpServer.createContext("/", allocHandler);//查询mpush机器

src/main/java/com/shinemo/mpush/alloc/HttpServerCreator.java

@@ -0,0 +1,107 @@
+/* Copyright rememberjava.com. Licensed under GPL 3. See http://rememberjava.com/license */
+package com.shinemo.mpush.alloc;
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.lang.ProcessBuilder.Redirect;
+import java.net.InetSocketAddress;
+import java.security.KeyStore;
+
+/**
+ * A HTTPS server using a self-signed TLS 1.2 key and certificate generated by
+ * the Java keytool command.
+ * <p>
+ */
+@SuppressWarnings("restriction")
+public class HttpServerCreator {
+
+    private static final File KEYSTORE_FILE = new File(System.getProperty("java.io.tmpdir"), "mpush.jks");
+
+    private static final String KEYSTORE_PASSWORD = "mpush_2017";
+
+    private static final String KEY_PASSWORD = "mpush_2017";
+
+    /**
+     * Generates a new self-signed certificate in /tmp/test.jks, if it does not
+     * already exist.
+     */
+    private static void generateCertificate() throws Exception {
+        if (KEYSTORE_FILE.exists()) return;
+
+        System.setProperty("javax.net.debug", "all");
+
+        File keytool = new File(System.getProperty("java.home"), "bin/keytool");
+
+        String[] genkeyCmd = new String[]{
+                keytool.toString(),
+                "-genkey",
+                "-keyalg", "RSA",
+                "-alias", "mpush.com",
+                "-validity", "365",
+                "-keysize", "2048",
+                "-dname", "cn=mpush.com,ou=mpush,o=OHUN .Inc,c=CN",
+                "-keystore", KEYSTORE_FILE.getAbsolutePath(),
+                "-storepass", KEYSTORE_PASSWORD,
+                "-keypass", KEY_PASSWORD};
+
+        System.out.println(String.join(" ", genkeyCmd));
+
+        ProcessBuilder processBuilder = new ProcessBuilder(genkeyCmd);
+        processBuilder.redirectErrorStream(true);
+        processBuilder.redirectOutput(Redirect.INHERIT);
+        processBuilder.redirectError(Redirect.INHERIT);
+        Process exec = processBuilder.start();
+        exec.waitFor();
+
+        System.out.println("Exit value: " + exec.exitValue());
+
+    }
+
+    private static HttpsServer createHttpsServer(int port) throws Exception {
+        generateCertificate();
+        HttpsServer httpsServer = HttpsServer.create(new InetSocketAddress(port), 0);
+        SSLContext sslContext = getSslContext();
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        return httpsServer;
+    }
+
+    private static HttpServer createHttpServer(int port) throws Exception {
+        HttpServer httpServer = HttpServer.create(new InetSocketAddress(port), 0);
+        return httpServer;
+    }
+
+    private static SSLContext getSslContext() throws Exception {
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(new FileInputStream(KEYSTORE_FILE), KEYSTORE_PASSWORD.toCharArray());
+
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+        kmf.init(ks, KEY_PASSWORD.toCharArray());
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+        tmf.init(ks);
+
+        SSLContext sslContext = SSLContext.getInstance("TLS");
+        sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+        return sslContext;
+    }
+
+    public static HttpServer createServer(int port, boolean https) {
+        try {
+            if (https) {
+                return HttpServerCreator.createHttpsServer(port);
+            } else {
+                return HttpServerCreator.createHttpServer(port);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

src/main/java/com/shinemo/mpush/alloc/PushHandler.java

@@ -94,7 +94,7 @@ private void sendPush(Map<String, Object> params) {
                 .setCallback(new PushCallback() {
                     @Override
                     public void onResult(PushResult result) {
-                        logger.error(result.toString());
+                        logger.info(result.toString());
                     }
                 })
         );

src/main/resources/mpush.conf

@@ -1,6 +1,7 @@
 mp.log-level=${log.level}
 mp.net.gateway-server-net=tcp // 网关服务使用的网络 udp/tcp
 mp.net.alloc-server-port=9999
+mp.net.alloc-server-protocol=http
 mp.zk.server-address="127.0.0.1:2181"
 mp.redis {// redis 集群配置
     password:""

src/test/resources/application.conf

@@ -3,6 +3,7 @@ mp.log.level=debug
 mp.log-conf-path=logback.xml
 mp.net.gateway-server-net=tcp // 网关服务使用的网络 udp/tcp
 mp.net.alloc-server-port=9999
+mp.net.alloc-server-protocol=https
 mp.zk.server-address="127.0.0.1:2181"
 mp.redis {// redis 集群配置
     password:""