[alibaba#289]fix grpc-adapter bug

Author: CodingSinger

README.md

@@ -76,7 +76,7 @@ try {
 }
 ```
 
-So far the code modification is done.  
+So far the code modification is done. We also provide [annotation support module](https://github.com/alibaba/Sentinel/blob/master/sentinel-extension/sentinel-annotation-aspectj/README.md) to define resource easier.
 
 ### 3. Define Rules
 
@@ -93,6 +93,8 @@ rules.add(rule);
 FlowRuleManager.loadRules(rules);
 ```
 
+For more information, please refer to [How To Use](https://github.com/alibaba/Sentinel/wiki/How-to-Use).
+
 ### 4. Check the Result
 
 After running the demo for a while, you can see the following records in `~/logs/csp/${appName}-metrics.log`.
@@ -144,3 +146,12 @@ These are only part of the companies using Sentinel, for reference only. If you
 ![Taiping Renshou](http://www.cntaiping.com/tplresource/cms/www/taiping/img/home_new/tp_logo_img.png)
 ![Shunfeng Technology](https://user-images.githubusercontent.com/9434884/48463502-2f48eb80-e817-11e8-984f-2f9b1b789e2d.png)
 ![Mandao](https://user-images.githubusercontent.com/9434884/48463559-6cad7900-e817-11e8-87e4-42952b074837.png)
+![每日优鲜](https://home.missfresh.cn/statics/img/logo.png)
+![二维火](https://user-images.githubusercontent.com/9434884/49358468-bc43de00-f70d-11e8-97fe-0bf05865f29f.png)
+![文轩在线](http://static.winxuancdn.com/css/v2/images/logo.png)
+![客如云](https://www.keruyun.com/static/krynew/images/logo.png)
+![亲宝宝](https://stlib.qbb6.com/wclt/img/home_hd/version1/title_logo.png)
+![杭州光云科技](https://www.raycloud.com/images/logo.png)
+![金汇金融](https://res.jinhui365.com/r/images/logo2.png?v=1.527)
+![Vivo](https://user-images.githubusercontent.com/9434884/49355264-c6f87600-f701-11e8-8109-054cf91df868.png)
+![闪电购](http://cdn.52shangou.com/shandianbang/official-source/3.1.1/build/images/logo.png)

sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.js

@@ -33,16 +33,14 @@ angular.module('sentinelDashboardApp')
 
         // toggle side bar
         $scope.click = function ($event) {
-          let element = angular.element($event.target);
           let entry = angular.element($event.target).scope().entry;
-          entry.active = !entry.active;
+          entry.active = !entry.active;// toggle this clicked app bar
 
-          if (entry.active === false) {
-            element.parent().children('ul').hide();
-          } else {
-            element.parent().parent().children('li').children('ul').hide();
-            element.parent().children('ul').show();
-          }
+          $scope.apps.forEach(function (item) {// collapse other app bars
+            if (item != entry) {
+              item.active = false;
+            }
+          });
         };
 
         /**

sentinel-transport/sentinel-transport-common/src/main/java/com/alibaba/csp/sentinel/transport/config/TransportConfig.java

@@ -16,6 +16,8 @@
 package com.alibaba.csp.sentinel.transport.config;
 
 import com.alibaba.csp.sentinel.config.SentinelConfig;
+import com.alibaba.csp.sentinel.util.HostNameUtil;
+import com.alibaba.csp.sentinel.util.StringUtil;
 
 /**
  * @author leyou
@@ -25,6 +27,7 @@ public class TransportConfig {
     public static final String CONSOLE_SERVER = "csp.sentinel.dashboard.server";
     public static final String SERVER_PORT = "csp.sentinel.api.port";
     public static final String HEARTBEAT_INTERVAL_MS = "csp.sentinel.heartbeat.interval.ms";
+    public static final String HEARTBEAT_CLIENT_IP = "csp.sentinel.heartbeat.client.ip";
 
     private static int runtimePort = -1;
 
@@ -66,4 +69,18 @@ public static String getPort() {
     public static void setRuntimePort(int port) {
         runtimePort = port;
     }
+
+    /**
+     * Get heartbeat client local ip.
+     * If the client ip not configured,it will be the address of local host
+     *
+     * @return the local ip.
+     */
+    public static String getHeartbeatClientIp() {
+        String ip = SentinelConfig.getConfig(HEARTBEAT_CLIENT_IP);
+        if (StringUtil.isBlank(ip)) {
+            ip = HostNameUtil.getIp();
+        }
+        return ip;
+    }
 }

sentinel-transport/sentinel-transport-common/src/test/java/com/alibaba/csp/sentinel/transport/config/TransportConfigTest.java

@@ -0,0 +1,25 @@
+package com.alibaba.csp.sentinel.transport.config;
+
+import com.alibaba.csp.sentinel.config.SentinelConfig;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class TransportConfigTest {
+
+    @Test
+    public void getClientIp() {
+        //config heartbeat client ip
+        System.setProperty(TransportConfig.HEARTBEAT_CLIENT_IP, "10.10.10.10");
+        String ip = TransportConfig.getHeartbeatClientIp();
+
+        assertNotNull(ip);
+        assertEquals(ip, "10.10.10.10");
+
+        //no heartbeat client ip
+        SentinelConfig.setConfig(TransportConfig.HEARTBEAT_CLIENT_IP, "");
+        ip = TransportConfig.getHeartbeatClientIp();
+        assertNotNull(ip);
+
+    }
+}

sentinel-transport/sentinel-transport-netty-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/HttpHeartbeatSender.java

@@ -85,7 +85,7 @@ public boolean sendHeartbeat() throws Exception {
             .setParameter("v", Constants.SENTINEL_VERSION)
             .setParameter("version", String.valueOf(System.currentTimeMillis()))
             .setParameter("hostname", HostNameUtil.getHostName())
-            .setParameter("ip", HostNameUtil.getIp())
+            .setParameter("ip", TransportConfig.getHeartbeatClientIp())
             .setParameter("port", TransportConfig.getPort())
             .setParameter("pid", String.valueOf(PidUtil.getPid()));
 

sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/command/SimpleHttpCommandCenter.java

@@ -19,11 +19,11 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
@@ -53,7 +53,7 @@ public class SimpleHttpCommandCenter implements CommandCenter {
     private static final int DEFAULT_PORT = 8719;
 
     @SuppressWarnings("rawtypes")
-    private static final Map<String, CommandHandler> handlerMap = new HashMap<String, CommandHandler>();
+    private static final Map<String, CommandHandler> handlerMap = new ConcurrentHashMap<String, CommandHandler>();
 
     private ExecutorService executor = Executors.newSingleThreadExecutor(
         new NamedThreadFactory("sentinel-command-center-executor"));
@@ -105,12 +105,14 @@ public void run() {
                     executor.submit(new ServerThread(serverSocket));
                     success = true;
                     port = serverSocket.getLocalPort();
+                } else {
+                    CommandCenterLog.info("[CommandCenter] chooses port fail, http command center will not work");
                 }
 
                 if (!success) {
                     port = PORT_UNINITIALIZED;
                 }
-                
+
                 TransportConfig.setRuntimePort(port);
                 executor.shutdown();
             }
@@ -119,11 +121,11 @@ public void run() {
 
         new Thread(serverInitTask).start();
     }
-    
+
     /**
      * Get a server socket from an available port from a base port.<br>
      * Increasing on port number will occur when the port has already been used.
-     * 
+     *
      * @param basePort base port to start
      * @return new socket with available port
      */
@@ -135,7 +137,7 @@ private static ServerSocket getServerSocketFromBasePort(int basePort) {
                 server.setReuseAddress(true);
                 return server;
             } catch (IOException e) {
-                tryCount ++;
+                tryCount++;
                 try {
                     TimeUnit.MILLISECONDS.sleep(30);
                 } catch (InterruptedException e1) {

sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/HeartbeatMessage.java

@@ -36,7 +36,7 @@ public class HeartbeatMessage {
 
     public HeartbeatMessage() {
         message.put("hostname", HostNameUtil.getHostName());
-        message.put("ip", HostNameUtil.getIp());
+        message.put("ip", TransportConfig.getHeartbeatClientIp());
         message.put("app", AppNameUtil.getAppName());
         message.put("port", String.valueOf(TransportConfig.getPort()));
     }