Merge remote-tracking branch 'origin/feature'

shiyindaxiaojie · Sep 6, 2023 · 82ca7da · 82ca7da
2 parents 01ca9c6 + 4587a12
commit 82ca7da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/eden-demo-layer-start/pom.xml b/eden-demo-layer-start/pom.xml
@@ -126,6 +126,16 @@
 			<groupId>io.github.shiyindaxiaojie</groupId>
 			<artifactId>eden-sentinel-spring-cloud-starter</artifactId>
 		</dependency>
+		<!--<dependency>
+			<groupId>com.alibaba.csp</groupId>
+			<artifactId>sentinel-datasource-zookeeper</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>-->
 
 		<!-- 链路跟踪组件 -->
 		<dependency>

diff --git a/eden-demo-layer-start/src/main/resources/config/application-dev.yml b/eden-demo-layer-start/src/main/resources/config/application-dev.yml
@@ -81,6 +81,11 @@ spring:
             dataId: ${spring.application.name}-flow-rule
             rule-type: flow
             data-type: json
+  #          zk:
+  #            server-addr: localhost:2181
+  #            path: /sentinel/${spring.application.name}/flow-rule
+  #            rule-type: flow
+  #            data-type: json
   redis: # 缓存数据库
     enabled: false # 默认关闭，请按需开启
     password: demo@123