diff --git a/main/APP/app_task_mqtt/app_task_mqtt.c b/main/APP/app_task_mqtt/app_task_mqtt.c
index 546e881..ca01ad9 100644
--- a/main/APP/app_task_mqtt/app_task_mqtt.c
+++ b/main/APP/app_task_mqtt/app_task_mqtt.c
@@ -27,13 +27,13 @@
 #include "esp_wifi.h"
 #include "esp_system.h"
 #include "nvs_flash.h"
-#include "esp_event.h"
-#include "esp_netif.h"
+#include "esp_event_loop.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "freertos/queue.h"
+#include "freertos/event_groups.h"
 
 #include "lwip/sockets.h"
 #include "lwip/dns.h"
@@ -43,88 +43,78 @@
 #include "mqtt_client.h"
 
 static const char *TAG = "MQTT_EXAMPLE";
+//mqtt连上事件
+static EventGroupHandle_t mqtt_event_group;
+const static int CONNECTED_BIT = BIT0;
+esp_mqtt_client_handle_t client;
 
-
-static void log_error_if_nonzero(const char *message, int error_code)
+static esp_err_t mqtt_event_handler(esp_mqtt_event_handle_t event)
 {
-    if (error_code != 0) {
-        ESP_LOGE(TAG, "Last error %s: 0x%x", message, error_code);
-    }
-}
-
-/*
- * @brief Event handler registered to receive MQTT events
- *
- *  This function is called by the MQTT client event loop.
- *
- * @param handler_args user data registered to the event.
- * @param base Event base for the handler(always MQTT Base in this example).
- * @param event_id The id for the received event.
- * @param event_data The data for the event, esp_mqtt_event_handle_t.
- */
-static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)
-{
-    ESP_LOGD(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, event_id);
-    esp_mqtt_event_handle_t event = event_data;
     esp_mqtt_client_handle_t client = event->client;
     int msg_id;
-    switch ((esp_mqtt_event_id_t)event_id) {
-    case MQTT_EVENT_CONNECTED:
-        ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED");
-        msg_id = esp_mqtt_client_publish(client, "/topic/qos1", "data_3", 0, 1, 0);
-        ESP_LOGI(TAG, "sent publish successful, msg_id=%d", msg_id);
+    // your_context_t *context = event->context;
+    switch (event->event_id) {
+        case MQTT_EVENT_CONNECTED://MQTT连上事件
+            ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED");
+            xEventGroupSetBits(mqtt_event_group, CONNECTED_BIT);
+            //发布主题
+            // msg_id = esp_mqtt_client_publish(client, "/topic/qos1", "data_3", 0, 1, 0);
+            // ESP_LOGI(TAG, "sent publish successful, msg_id=%d", msg_id);
+            //发送订阅
+            // msg_id = esp_mqtt_client_subscribe(client, "/topic/qos0", 0);
+            // ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
+            //发送订阅
+            msg_id = esp_mqtt_client_subscribe(client, "/topic/qos1", 1);
+            ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
+            //取消订阅
+            // msg_id = esp_mqtt_client_unsubscribe(client, "/topic/qos1");
+            // ESP_LOGI(TAG, "sent unsubscribe successful, msg_id=%d", msg_id);
+            break;
+        case MQTT_EVENT_DISCONNECTED://MQTT断开连接事件
+            ESP_LOGI(TAG, "MQTT_EVENT_DISCONNECTED");
+            //mqtt连上事件
+            xEventGroupClearBits(mqtt_event_group, CONNECTED_BIT);
+            break;
 
-        msg_id = esp_mqtt_client_subscribe(client, "/topic/qos0", 0);
-        ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
-
-        msg_id = esp_mqtt_client_subscribe(client, "/topic/qos1", 1);
-        ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
-
-        msg_id = esp_mqtt_client_unsubscribe(client, "/topic/qos1");
-        ESP_LOGI(TAG, "sent unsubscribe successful, msg_id=%d", msg_id);
-        break;
-    case MQTT_EVENT_DISCONNECTED:
-        ESP_LOGI(TAG, "MQTT_EVENT_DISCONNECTED");
-        break;
-
-    case MQTT_EVENT_SUBSCRIBED:
-        ESP_LOGI(TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=%d", event->msg_id);
-        msg_id = esp_mqtt_client_publish(client, "/topic/qos0", "data", 0, 0, 0);
-        ESP_LOGI(TAG, "sent publish successful, msg_id=%d", msg_id);
-        break;
-    case MQTT_EVENT_UNSUBSCRIBED:
-        ESP_LOGI(TAG, "MQTT_EVENT_UNSUBSCRIBED, msg_id=%d", event->msg_id);
-        break;
-    case MQTT_EVENT_PUBLISHED:
-        ESP_LOGI(TAG, "MQTT_EVENT_PUBLISHED, msg_id=%d", event->msg_id);
-        break;
-    case MQTT_EVENT_DATA:
-        ESP_LOGI(TAG, "MQTT_EVENT_DATA");
-        printf("TOPIC=%.*s\r\n", event->topic_len, event->topic);
-        printf("DATA=%.*s\r\n", event->data_len, event->data);
-        break;
-    case MQTT_EVENT_ERROR:
-        ESP_LOGI(TAG, "MQTT_EVENT_ERROR");
-        if (event->error_handle->error_type == MQTT_ERROR_TYPE_TCP_TRANSPORT) {
-            log_error_if_nonzero("reported from esp-tls", event->error_handle->esp_tls_last_esp_err);
-            log_error_if_nonzero("reported from tls stack", event->error_handle->esp_tls_stack_err);
-            log_error_if_nonzero("captured as transport's socket errno",  event->error_handle->esp_transport_sock_errno);
-            ESP_LOGI(TAG, "Last errno string (%s)", strerror(event->error_handle->esp_transport_sock_errno));
-
-        }
-        break;
-    default:
-        ESP_LOGI(TAG, "Other event id:%d", event->event_id);
-        break;
+        case MQTT_EVENT_SUBSCRIBED://MQTT发送订阅事件
+            ESP_LOGI(TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=%d", event->msg_id);
+            msg_id = esp_mqtt_client_publish(client, "/topic/qos0", "订阅成功", 0, 0, 0);
+            ESP_LOGI(TAG, "sent publish successful, msg_id=%d", msg_id);
+            break;
+        case MQTT_EVENT_UNSUBSCRIBED://MQTT取消订阅事件
+            ESP_LOGI(TAG, "MQTT_EVENT_UNSUBSCRIBED, msg_id=%d", event->msg_id);
+            break;
+        case MQTT_EVENT_PUBLISHED://MQTT发布事件
+            ESP_LOGI(TAG, "MQTT_EVENT_PUBLISHED, msg_id=%d", event->msg_id);
+            break;
+        case MQTT_EVENT_DATA://MQTT接受数据事件
+            ESP_LOGI(TAG, "MQTT_EVENT_DATA");
+            printf("TOPIC=%.*s\r\n", event->topic_len, event->topic);   //主题
+            printf("DATA=%.*s\r\n", event->data_len, event->data);      //内容
+            break;
+        case MQTT_EVENT_ERROR://MQTT错误事件
+            ESP_LOGI(TAG, "MQTT_EVENT_ERROR");
+            xEventGroupClearBits(mqtt_event_group, CONNECTED_BIT);
+            break; 
+        default:
+            break;
     }
+    return ESP_OK;
 }
 
+//mqtt初始化
 static void mqtt_app_start(void)
 {
+    mqtt_event_group = xEventGroupCreate();
     esp_mqtt_client_config_t mqtt_cfg = {
-        .host = "mqtt://mqtt.impressionyang.top",
-        .port = 21883,
+        .host = "117.50.172.12",            //MQTT服务器IP
+        .event_handle = mqtt_event_handler, //MQTT事件
+        .port=21883,                         //端口
+        .username = "admin",                //用户名
+        .password = "public",               //密码
+        // .user_context = (void *)your_context
     };
+
 #if CONFIG_BROKER_URL_FROM_STDIN
     char line[128];
 
@@ -150,39 +140,12 @@ static void mqtt_app_start(void)
     }
 #endif /* CONFIG_BROKER_URL_FROM_STDIN */
 
-    esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
-    /* The last argument may be used to pass data to the event handler, in this example mqtt_event_handler */
-    esp_mqtt_client_register_event(client, ESP_EVENT_ANY_ID, mqtt_event_handler, NULL);
+    client = esp_mqtt_client_init(&mqtt_cfg);
     esp_mqtt_client_start(client);
+    //等mqtt连上
+    xEventGroupWaitBits(mqtt_event_group, CONNECTED_BIT, false, true, portMAX_DELAY);
 }
 
-// void app_main(void)
-// {
-//     ESP_LOGI(TAG, "[APP] Startup..");
-//     ESP_LOGI(TAG, "[APP] Free memory: %d bytes", esp_get_free_heap_size());
-//     ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
-
-//     esp_log_level_set("*", ESP_LOG_INFO);
-//     esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE);
-//     esp_log_level_set("MQTT_EXAMPLE", ESP_LOG_VERBOSE);
-//     esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE);
-//     esp_log_level_set("esp-tls", ESP_LOG_VERBOSE);
-//     esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE);
-//     esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE);
-
-//     ESP_ERROR_CHECK(nvs_flash_init());
-//     ESP_ERROR_CHECK(esp_netif_init());
-//     ESP_ERROR_CHECK(esp_event_loop_create_default());
-
-//     /* This helper function configures Wi-Fi or Ethernet, as selected in menuconfig.
-//      * Read "Establishing Wi-Fi or Ethernet Connection" section in
-//      * examples/protocols/README.md for more information about this function.
-//      */
-//     ESP_ERROR_CHECK(example_connect());
-
-//     mqtt_app_start();
-// }
-
 static void _app_task_mqtt_run(void* param)
 {
     while (!app_main_handle_get_nework_state()) {
@@ -191,7 +154,8 @@ static void _app_task_mqtt_run(void* param)
     ESP_ERROR_CHECK(esp_netif_init());
     mqtt_app_start();
     while (1) {
-        vTaskDelay(10);
+        vTaskDelay(100);
+        esp_mqtt_client_publish(client, "/topic/qos0", "Hello MQTT", 0, 0, 0);
     }
 }
 
diff --git a/main/APP/app_task_wifi/app_task_wifi.c b/main/APP/app_task_wifi/app_task_wifi.c
index 360ef3c..6130db9 100644
--- a/main/APP/app_task_wifi/app_task_wifi.c
+++ b/main/APP/app_task_wifi/app_task_wifi.c
@@ -27,8 +27,8 @@
 #include <string.h>
 
 /* Set the SSID and Password via project configuration, or can set directly here */
-#define DEFAULT_SSID "1022"
-#define DEFAULT_PWD "w15077040648"
+#define DEFAULT_SSID "IMPRESSIONYANG"
+#define DEFAULT_PWD "88888888"
 
 #if CONFIG_EXAMPLE_WIFI_ALL_CHANNEL_SCAN
 #define DEFAULT_SCAN_METHOD WIFI_ALL_CHANNEL_SCAN
@@ -84,6 +84,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
 /* Initialize Wi-Fi as sta and set scan method */
 static void fast_scan(void)
 {
+    tcpip_adapter_init();    
     ESP_ERROR_CHECK(esp_netif_init());
     ESP_ERROR_CHECK(esp_event_loop_create_default());