Merge pull request #2331 from terminux/gh-2327

NacosDataSourceProperties support for contextPath configuration items

spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java

@@ -32,6 +32,8 @@ public class NacosDataSourceProperties extends AbstractDataSourceProperties {
 
 	private String serverAddr;
 
+	private String contextPath;
+
 	private String username;
 
 	private String password;
@@ -71,6 +73,14 @@ public class NacosDataSourceProperties extends AbstractDataSourceProperties {
 		this.serverAddr = serverAddr;
 	}
 
+	public String getContextPath() {
+		return contextPath;
+	}
+
+	public void setContextPath(String contextPath) {
+		this.contextPath = contextPath;
+	}
+
 	public String getUsername() {
 		return username;
 	}

spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java

@@ -35,6 +35,8 @@ public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource>
 
 	private String serverAddr;
 
+	private String contextPath;
+
 	private String username;
 
 	private String password;
@@ -63,6 +65,9 @@ public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource>
 			properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint);
 		}
 
+		if (!StringUtils.isEmpty(this.contextPath)) {
+			properties.setProperty(PropertyKeyConst.CONTEXT_PATH, this.contextPath);
+		}
 		if (!StringUtils.isEmpty(this.accessKey)) {
 			properties.setProperty(PropertyKeyConst.ACCESS_KEY, this.accessKey);
 		}
@@ -94,6 +99,14 @@ public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource>
 		this.serverAddr = serverAddr;
 	}
 
+	public String getContextPath() {
+		return contextPath;
+	}
+
+	public void setContextPath(String contextPath) {
+		this.contextPath = contextPath;
+	}
+
 	public String getUsername() {
 		return username;
 	}

spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java

@@ -39,6 +39,8 @@ public class NacosDataSourceFactoryBeanTests {
 
 	private String serverAddr = "localhost:8848";
 
+	private String contextPath = "/my-nacos";
+
 	private String accessKey = "ak";
 
 	private String secretKey = "sk";
@@ -56,6 +58,7 @@ public class NacosDataSourceFactoryBeanTests {
 		factoryBean.setDataId(dataId);
 		factoryBean.setGroupId(groupId);
 		factoryBean.setServerAddr(serverAddr);
+		factoryBean.setContextPath(contextPath);
 		factoryBean.setConverter(converter);
 
 		NacosDataSource nacosDataSource = mock(NacosDataSource.class);
@@ -69,6 +72,7 @@ public class NacosDataSourceFactoryBeanTests {
 		assertThat(factoryBean.getDataId()).isEqualTo(dataId);
 		assertThat(factoryBean.getGroupId()).isEqualTo(groupId);
 		assertThat(factoryBean.getServerAddr()).isEqualTo(serverAddr);
+		assertThat(factoryBean.getContextPath()).isEqualTo(contextPath);
 	}
 
 	@Test

spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java

@@ -31,11 +31,13 @@ public class NacosDataSourcePropertiesTests {
 	public void testNacosWithAddr() {
 		NacosDataSourceProperties nacosDataSourceProperties = new NacosDataSourceProperties();
 		nacosDataSourceProperties.setServerAddr("127.0.0.1:8848");
+		nacosDataSourceProperties.setContextPath("/my-nacos");
 		nacosDataSourceProperties.setRuleType(RuleType.FLOW);
 		nacosDataSourceProperties.setDataId("sentinel");
 		nacosDataSourceProperties.setGroupId("custom-group");
 		nacosDataSourceProperties.setDataType("xml");
 
+		assertThat(nacosDataSourceProperties.getContextPath()).isEqualTo("/my-nacos");
 		assertThat(nacosDataSourceProperties.getGroupId()).isEqualTo("custom-group");
 		assertThat(nacosDataSourceProperties.getDataId()).isEqualTo("sentinel");
 		assertThat(nacosDataSourceProperties.getDataType()).isEqualTo("xml");