Merge pull request #285 from lets-blade/dev

Dev

README.md

@@ -64,14 +64,14 @@ Run with `Maven`:
 <dependency>
     <groupId>com.bladejava</groupId>
     <artifactId>blade-mvc</artifactId>
-    <version>2.0.11.BETA</version>
+    <version>2.0.12.ALPHA</version>
 </dependency>
 ```
 
 or `Gradle`:
 
 ```sh
-compile 'com.bladejava:blade-mvc:2.0.11.BETA'
+compile 'com.bladejava:blade-mvc:2.0.12.ALPHA'
 ```
 
 Write the `main` method and the `Hello World`:

README_CN.md

@@ -61,7 +61,7 @@
 <dependency>
 	<groupId>com.bladejava</groupId>
 	<artifactId>blade-mvc</artifactId>
-	<version>2.0.11.BETA</version>
+	<version>2.0.12.ALPHA</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@
 或者  `Gradle`:
 
 ```sh
-compile 'com.bladejava:blade-mvc:2.0.11.BETA'
+compile 'com.bladejava:blade-mvc:2.0.12.ALPHA'
 ```
 
 编写 `main` 函数写一个 `Hello World`：

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 
 group = 'com.bladejava'
-version = '2.0.11.BETA'
+version = '2.0.12.ALPHA'
 
 description = 'blade-mvc'
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.bladejava</groupId>
     <artifactId>blade-mvc</artifactId>
-    <version>2.0.12-SNAPSHOT</version>
+    <version>2.0.12.ALPHA</version>
     <packaging>jar</packaging>
 
     <name>blade</name>

src/main/java/com/blade/Blade.java

@@ -46,6 +46,7 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.net.BindException;
 import java.nio.file.*;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
@@ -845,7 +846,9 @@ public Blade start(Class<?> mainCls, String... args) {
                     server.start(Blade.this);
                     latch.countDown();
                     server.join();
-
+                } catch (BindException e) {
+                    log.error("Bind address error\n", e);
+                    System.exit(0);
                 } catch (Exception e) {
                     startupExceptionHandler.accept(e);
                 }
@@ -1045,7 +1048,9 @@ private void loadConfig(String[] args) {
         }
 
         Map<String, String> argsMap = BladeKit.parseArgs(args);
-        log.info("command line args: {}", JsonKit.toString(argsMap));
+        if (null != argsMap && !argsMap.isEmpty()) {
+            log.info(" command line args: {}", JsonKit.toString(argsMap));
+        }
 
         if (StringKit.isNotEmpty(argsMap.get(ENV_KEY_APP_ENV))) {
             envName = argsMap.get(ENV_KEY_APP_ENV);
@@ -1069,7 +1074,7 @@ private void loadConfig(String[] args) {
             argsMap.remove(ENV_KEY_APP_ENV);
         }
 
-        log.info("current environment is: {}", envName);
+        this.environment.set(ENV_KEY_APP_ENV, envName);
 
         this.register(this.environment);
 

src/main/java/com/blade/exception/BladeException.java

@@ -29,6 +29,10 @@ public class BladeException extends RuntimeException {
     protected int    status;
     protected String name;
 
+    public BladeException(Throwable cause) {
+        super(cause);
+    }
+
     public BladeException(int status, String name) {
         this.status = status;
         this.name = name;
@@ -40,4 +44,8 @@ public BladeException(int status, String name, String message) {
         this.name = name;
     }
 
+    public static BladeException wrapper(Exception e) {
+        return new BladeException(e);
+    }
+
 }

src/main/java/com/blade/kit/BladeKit.java

@@ -36,6 +36,7 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.lang.invoke.SerializedLambda;
+import java.lang.management.ManagementFactory;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -364,4 +365,16 @@ public static Map<String, String> parseArgs(String[] args) {
         }
         return argsMap;
     }
+
+    /**
+     * @return Get the process id of the current JVM process
+     */
+    public static Integer getPID() {
+        String mbean = ManagementFactory.getRuntimeMXBean().getName();
+        if (mbean.contains("@")) {
+            return Integer.valueOf(mbean.substring(0, mbean.indexOf("@")));
+        }
+        return -1;
+    }
+
 }

src/main/java/com/blade/mvc/Const.java

@@ -31,7 +31,7 @@ public interface Const {
     int          DEFAULT_SERVER_PORT        = 9000;
     String       DEFAULT_SERVER_ADDRESS     = "0.0.0.0";
     String       LOCAL_IP_ADDRESS           = "127.0.0.1";
-    String       VERSION                    = "2.0.11.RELEASE";
+    String       VERSION                    = "2.0.12.ALPHA";
     String       WEB_JARS                   = "/webjars/";
     String       CLASSPATH                  = BladeKit.getCurrentClassPath();
     String       CONTENT_TYPE_HTML          = "text/html; charset=UTF-8";
@@ -44,6 +44,7 @@ public interface Const {
     List<String> DEFAULT_STATICS            = new ArrayList<>(
             Arrays.asList("/favicon.ico", "/robots.txt", "/static", "/upload", "/webjars/"));
 
+    @Deprecated
     String PROP_NAME0 = "classpath:app.properties";
     String PROP_NAME  = "classpath:application.properties";
 
@@ -76,13 +77,11 @@ public interface Const {
     String ENE_KEY_SSL_PRIVATE_KEY_PASS      = "server.ssl.private-key-pass";
     String ENC_KEY_NETTY_ACCEPT_THREAD_COUNT = "server.netty.accept-thread-count";
     String ENV_KEY_NETTY_IO_THREAD_COUNT     = "server.netty.io-thread-count";
-    String ENV_KEY_NETTY_SO_BACKLOG          = "server.netty.so-backlog";
 
     String ENV_KEY_BOOT_CONF        = "boot_conf";
     String ENV_KEY_AUTO_REFRESH_DIR = "app.auto.refresh.dir";
 
     // netty default config
-    int DEFAULT_SO_BACKLOG          = 1024;
     int DEFAULT_ACCEPT_THREAD_COUNT = 1;
     int DEFAULT_IO_THREAD_COUNT     = 0;