Merge branch 'dev' into dev

sharding-proxy/src/main/java/io/shardingjdbc/proxy/config/ShardingRuleRegistry.java

@@ -31,6 +31,7 @@ import lombok.Getter;
 import javax.sql.DataSource;
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -61,8 +62,8 @@ public final class ShardingRuleRegistry {
     private ShardingRuleRegistry() {
         YamlProxyConfiguration yamlProxyConfiguration;
         try {
-            yamlProxyConfiguration = YamlProxyConfiguration.unmarshal(new File(getClass().getResource("/conf/sharding-config.yaml").getFile()));
-        } catch (final IOException ex) {
+            yamlProxyConfiguration = YamlProxyConfiguration.unmarshal(new File(getClass().getResource("/conf/sharding-config.yaml").toURI().getPath()));
+        } catch (final IOException | URISyntaxException ex) {
             throw new ShardingJdbcException(ex);
         }
         dataSourceMap = new HashMap<>(128, 1);

sharding-proxy/src/main/resources/bin/start.sh

@@ -12,7 +12,7 @@ fi
 
 STDOUT_FILE=$LOGS_DIR/stdout.log
 
-PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`
+PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | grep -v grep | awk '{print $2}'`
 if [ -n "$PIDS" ]; then
     echo "ERROR: The $SERVER_NAME already started!"
     echo "PID: $PIDS"

sharding-proxy/src/main/resources/bin/stop.sh

@@ -5,7 +5,7 @@ cd `dirname $0`
 cd ..
 DEPLOY_DIR=`pwd`
 
-PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" |awk '{print $2}'`
+PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | grep -v grep |awk '{print $2}'`
 if [ -z "$PIDS" ]; then
     echo "ERROR: The $SERVER_NAME does not started!"
     exit 1