From 3cf57afe32b499097a105292c6f27240b0cce2e3 Mon Sep 17 00:00:00 2001
From: fangjian0423 <fangjian0423@gmail.com>
Date: Fri, 11 Jan 2019 14:54:23 +0800
Subject: [PATCH] add property key `spring.cloud.sentinel.transport.clientIp`
 to configure client ip to connect with sentinel dashboard

---
 .../cloud/alibaba/sentinel/SentinelProperties.java       | 9 +++++++++
 .../sentinel/custom/SentinelAutoConfiguration.java       | 5 +++++
 .../additional-spring-configuration-metadata.json        | 5 +++++
 3 files changed, 19 insertions(+)

diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java
index 63ce6865..1a147009 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java
@@ -262,6 +262,8 @@ public class SentinelProperties {
 		 */
 		private String heartbeatIntervalMs;
 
+		private String clientIp;
+
 		public String getHeartbeatIntervalMs() {
 			return heartbeatIntervalMs;
 		}
@@ -286,6 +288,13 @@ public class SentinelProperties {
 			this.dashboard = dashboard;
 		}
 
+		public String getClientIp() {
+			return clientIp;
+		}
+
+		public void setClientIp(String clientIp) {
+			this.clientIp = clientIp;
+		}
 	}
 
 	public static class Filter {
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java
index 4349cf70..a4d4176b 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java
@@ -96,6 +96,11 @@ public class SentinelAutoConfiguration {
 			System.setProperty(TransportConfig.HEARTBEAT_INTERVAL_MS,
 					properties.getTransport().getHeartbeatIntervalMs());
 		}
+		if (StringUtils.isEmpty(System.getProperty(TransportConfig.HEARTBEAT_CLIENT_IP))
+				&& StringUtils.hasText(properties.getTransport().getClientIp())) {
+			System.setProperty(TransportConfig.HEARTBEAT_CLIENT_IP,
+					properties.getTransport().getClientIp());
+		}
 		if (StringUtils.isEmpty(System.getProperty(SentinelConfig.CHARSET))
 				&& StringUtils.hasText(properties.getMetric().getCharset())) {
 			System.setProperty(SentinelConfig.CHARSET,
diff --git a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d05b0863..b445fc6a 100644
--- a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -18,6 +18,11 @@
       "defaultValue": "8719",
       "description": "sentinel api port."
     },
+    {
+      "name": "spring.cloud.sentinel.transport.clientIp",
+      "type": "java.lang.String",
+      "description": "sentinel client ip connect to dashboard."
+    },
     {
       "name": "spring.cloud.sentinel.transport.dashboard",
       "type": "java.lang.String",