diff --git a/docker/run-all/docker-compose.yml b/docker/run-all/docker-compose.yml
index 87a50183..ce394a4a 100644
--- a/docker/run-all/docker-compose.yml
+++ b/docker/run-all/docker-compose.yml
@@ -81,9 +81,9 @@ services:
       - "spring.r2dbc.url=r2dbc:postgresql://postgres:5432/jetlinks" #数据库连接地址
       - "spring.r2dbc.username=postgres"
       - "spring.r2dbc.password=jetlinks"
-      - "spring.data.elasticsearch.client.reactive.endpoints=elasticsearch:9200"
-      #        - "spring.data.elasticsearch.client.reactive.username=admin"
-      #        - "spring.data.elasticsearch.client.reactive.password=admin"
+      - "spring.elasticsearch.urls=elasticsearch:9200"
+      #        - "spring.elasticsearch.username=admin"
+      #        - "spring.elasticsearch.password=admin"
       #        - "spring.reactor.debug-agent.enabled=false" #设置为false能提升性能
       - "spring.redis.host=redis"
       - "spring.redis.port=6379"
diff --git a/jetlinks-standalone/src/main/resources/application-embedded.yml b/jetlinks-standalone/src/main/resources/application-embedded.yml
index 34386f53..8585e8ff 100644
--- a/jetlinks-standalone/src/main/resources/application-embedded.yml
+++ b/jetlinks-standalone/src/main/resources/application-embedded.yml
@@ -14,14 +14,12 @@ spring:
     password:
     pool:
       max-size: 32
-  data:
-    elasticsearch:
-      client:
-        reactive:
-          endpoints: ${elasticsearch.client.host}:${elasticsearch.client.port}
-          max-in-memory-size: 100MB
-          socket-timeout: ${elasticsearch.client.socket-timeout}
-          connection-timeout: ${elasticsearch.client.socket-timeout}
+  elasticsearch:
+    uris: localhost:9201
+    socket-timeout: 10s
+    connection-timeout: 15s
+    webclient:
+      max-in-memory-size: 100MB
 easyorm:
   default-schema: PUBLIC # 数据库默认的schema
   dialect: h2 #数据库方言
@@ -31,13 +29,6 @@ elasticsearch:
     data-path: ./data/elasticsearch
     port: 9201
     host: 0.0.0.0
-  client:
-    host: localhost
-    port: 9201
-    max-conn-total: 128
-    connect-timeout: 5000
-    socket-timeout: 5000
-    connection-request-timeout: 8000
   index:
     default-strategy: time-by-month #默认es的索引按月进行分表, direct则为直接操作索引.
     settings: