Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	cloud-gateway/src/main/resources/bootstrap.yml

cloud-gateway/src/main/resources/bootstrap.yml

@@ -45,3 +45,19 @@ spring:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           # 系统环境Config共享配置
           - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        dashboard: 127.0.0.1:8718
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: ${nacos.addr}
+            dataId: sentinel-cloud-gateway
+            groupId: DEFAULT_GROUP
+            namespace: ${nacos.namespace}
+            data-type: json
+            rule-type: gw-flow