diff --git a/examples/mqtt/mqtt_connect.py b/examples/mqtt/mqtt_connect.py
index 06b4f8805..108c5e855 100644
--- a/examples/mqtt/mqtt_connect.py
+++ b/examples/mqtt/mqtt_connect.py
@@ -1,28 +1,9 @@
 import mqtt
 
-client = mqtt.MQTT('192.168.1.255')
-
-client.setHost('broker.emqx.io')
-client.setPort(1883)
-client.setClientID('123456dddecetdc')
-client.setUsername('test1')
-client.setPassword('aabbccdd')
-client.setVersion('4')
-client.setKeepAlive('10')
+client = mqtt.MQTT('11111',port=1883,clinetID='clientid',username='name_',password='passwd_')
 
 ret = client.connect()
 print("ret:%d" % ret)
 
-client.publish('topic1234', 'hello pikascript')
-
-
-def callback1(signal):
-    print("py cb: %s:%s" % (client.recv_topic, client.recv_msg))
-
-
-ret = client.subscribe('topic', 1, callback1)
-
-client.listSubscribrTopic()
-
-#ret = client.disconnect()
-#print("ret:%d" % ret)
+ret = client.disconnect()
+print("ret:%d" % ret)
diff --git a/examples/mqtt/mqtt_publish.py b/examples/mqtt/mqtt_publish.py
new file mode 100644
index 000000000..498a884f4
--- /dev/null
+++ b/examples/mqtt/mqtt_publish.py
@@ -0,0 +1,21 @@
+import mqtt
+
+client = mqtt.MQTT('192.168.1.255')
+
+client.setHost('broker.emqx.io')
+client.setPort(1883)
+client.setClientID('123456dddecetdc')
+client.setUsername('test1')
+client.setPassword('aabbccdd')
+client.setVersion('3')
+client.setKeepAlive('10')
+
+ret = client.connect()
+print("ret:%d" % ret)
+
+client.publish(0,'topic_pikapy', 'hello pikascript qos=0')
+client.publish(1,'topic_pikapy', 'hello pikascript qos=1')
+client.publish(2,'topic_pikapy', 'hello pikascript qos=2')
+
+ret = client.disconnect()
+print("ret:%d" % ret)
\ No newline at end of file
diff --git a/examples/mqtt/mqtt_set_para.py b/examples/mqtt/mqtt_set_para.py
new file mode 100644
index 000000000..27ddb9d29
--- /dev/null
+++ b/examples/mqtt/mqtt_set_para.py
@@ -0,0 +1,45 @@
+import mqtt
+
+test_baidu_ca_crt = ["-----BEGIN CERTIFICATE-----\r\n"
+    "MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G\r\n"
+    "A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp\r\n"
+    "Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4\r\n"
+    "MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG\r\n"
+    "A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI\r\n"
+    "hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8\r\n"
+    "RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT\r\n"
+    "gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm\r\n"
+    "KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd\r\n"
+    "QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ\r\n"
+    "XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw\r\n"
+    "DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o\r\n"
+    "LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU\r\n"
+    "RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp\r\n"
+    "jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK\r\n"
+    "6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX\r\n"
+    "mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs\r\n"
+    "Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH\r\n"
+    "WD9f\r\n"
+    "-----END CERTIFICATE-----"]
+
+client = mqtt.MQTT('192.168.1.255')
+
+#test TLS
+# client.setHost('j6npr4w.mqtt.iot.gz.baidubce.com')
+# client.setPort(1884)
+# client.setCa(test_baidu_ca_crt)
+
+client.setHost('broker.emqx.io')
+client.setPort(1883)
+
+client.setClientID('123456dddecetdc')
+client.setUsername('j6npr4w/mqtt-client-dev')
+client.setPassword('lcUhUs5VYLMSbrnB')
+client.setVersion('3')
+client.setKeepAlive('10')
+
+ret = client.connect()
+print("ret:%d" % ret)
+
+ret = client.disconnect()
+print("ret:%d" % ret)
\ No newline at end of file
diff --git a/examples/mqtt/mqtt_subscribe.py b/examples/mqtt/mqtt_subscribe.py
new file mode 100644
index 000000000..b573ad81c
--- /dev/null
+++ b/examples/mqtt/mqtt_subscribe.py
@@ -0,0 +1,28 @@
+import mqtt
+
+client = mqtt.MQTT('192.168.1.255')
+
+client.setHost('broker.emqx.io')
+client.setPort(1883)
+client.setClientID('123456dddecetdc')
+client.setUsername('test1')
+client.setPassword('aabbccdd')
+client.setVersion('4')
+client.setKeepAlive('10')
+
+ret = client.connect()
+print("ret:%d" % ret)
+
+client.publish('topic1234', 'hello pikascript')
+
+
+def callback1(signal):
+    print("py cb: %s:%s" % (client.recv_topic, client.recv_msg))
+
+
+ret = client.subscribe('topic', 1, callback1)
+
+client.listSubscribrTopic()
+
+#ret = client.disconnect()
+#print("ret:%d" % ret)
\ No newline at end of file
diff --git a/package/mqtt/_mqtt.pyi b/package/mqtt/_mqtt.pyi
index 305ad1bd0..7f6759bd5 100644
--- a/package/mqtt/_mqtt.pyi
+++ b/package/mqtt/_mqtt.pyi
@@ -54,7 +54,7 @@ class _MQTT:
         pass
         """listSubscribrTopic """
 
-    def publish(self, topic: str, payload: str) -> int:
+    def publish(self, qos:int, topic: str, payload: str) -> int:
         pass
         """publish to the mqtt-server."""
 
diff --git a/package/mqtt/_mqtt__MQTT.c b/package/mqtt/_mqtt__MQTT.c
index 98332b48d..74fbeab83 100644
--- a/package/mqtt/_mqtt__MQTT.c
+++ b/package/mqtt/_mqtt__MQTT.c
@@ -32,6 +32,9 @@ void _mqtt__MQTT___init__(PikaObj* self,
         obj_setStr(self, "host_str", ip);
         mqtt_set_host(_client, obj_getStr(self, "host_str"));
     }
+    else {
+        __platform_printf("mqtt_init input ip none\r\n");
+    }
 
     memset(port_str, 0, sizeof(port_str));
     __platform_sprintf(port_str, "%d", port);
@@ -42,30 +45,48 @@ void _mqtt__MQTT___init__(PikaObj* self,
         obj_setStr(self, "id_str", clinetID);
         mqtt_set_client_id(_client, obj_getStr(self, "id_str"));
     }
+    else {
+        __platform_printf("mqtt_init input clinetID none\r\n");
+    }
 
     if (strlen(username) > 0) {
         obj_setStr(self, "username_str", username);
         mqtt_set_user_name(_client, obj_getStr(self, "username_str"));
     }
+    else {
+        __platform_printf("mqtt_init input username none\r\n");
+    }
 
     if (strlen(password) > 0) {
         obj_setStr(self, "password_str", password);
         mqtt_set_password(_client, obj_getStr(self, "password_str"));
     }
+    else {
+        __platform_printf("mqtt_init input password none\r\n");
+    }
 
     tmp = atoi(version);
     if (tmp > 0) {
         mqtt_set_version(_client, tmp);
     }
+    else {
+        __platform_printf("mqtt_init input version none\r\n");
+    }
 
     if (strlen(ca) > 0) {
         obj_setStr(self, "ca_str", ca);
         mqtt_set_ca(_client, obj_getStr(self, "ca_str"));
     }
+    else {
+        __platform_printf("mqtt_init input ca none\r\n");
+    }
 
     if (keepalive > 0) {
         mqtt_set_keep_alive_interval(_client, keepalive);
     }
+    else {
+        __platform_printf("mqtt_init input keepalive none\r\n");
+    }
 
     mqtt_set_clean_session(_client, 1);
 
@@ -130,7 +151,7 @@ int _mqtt__MQTT_disconnect(PikaObj* self) {
         __platform_printf("mqtt disconnect ERROR! :%d\r\n", ret);
 
     if (ret == 0)
-        __platform_printf("mqtt disconnect Done\r\n");
+        __platform_printf("mqtt disconnect OK\r\n");
     return ret;
 }
 
@@ -146,9 +167,9 @@ PikaObj* _mqtt__MQTT_listSubscribrTopic(PikaObj* self) {
 
     ret = mqtt_list_subscribe_topic(_client);
     if (ret == 0)
-        __platform_printf("MQTT_listSubscribrTopic Done\r\n");
+        __platform_printf("MQTT_listSubscribrTopic OK\r\n");
     else
-        __platform_printf("MQTT_listSubscribrTopic error\r\n");
+        __platform_printf("MQTT_listSubscribrTopic ERROR\r\n");
 
     return NULL;
 }
@@ -159,30 +180,35 @@ PikaObj* _mqtt__MQTT_listSubscribrTopic(PikaObj* self) {
 // 输入参数：主题名称，有效数据
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
-int _mqtt__MQTT_publish(PikaObj* self, char* topic, char* payload) {
+int _mqtt__MQTT_publish(PikaObj *self, int qos, char* topic, char* payload) {
     int ret;
     mqtt_message_t msg;
 
     mqtt_client_t* _client = obj_getPtr(self, "_client");
     memset(&msg, 0, sizeof(msg));
 
+    if((qos < 0) || (qos > 2)) {
+        __platform_printf("input qos error\r\n");
+        return -1;
+    }
     if (strlen(topic) <= 0) {
         __platform_printf("input topic error\r\n");
-        return -1;
+        return -2;
     }
 
     if (strlen(payload) <= 0) {
         __platform_printf("input payload error\r\n");
-        return -2;
+        return -3;
     }
 
     msg.payload = (void*)payload;
-    msg.qos = 1;
+    msg.qos = qos;
+    __platform_printf("msg.qos:%d\r\n",msg.qos);
     ret = mqtt_publish(_client, topic, &msg);
     if (ret == 0)
-        __platform_printf("MQTT_publish Done\r\n");
+        __platform_printf("MQTT_publish OK\r\n");
     else
-        __platform_printf("MQTT_publish error\r\n");
+        __platform_printf("MQTT_publish ERROR\r\n");
     return ret;
 }
 
@@ -203,7 +229,7 @@ int _mqtt__MQTT_setCa(PikaObj* self, char* ca) {
         __platform_printf("input ca data error\r\n");
         return -2;
     }
-
+    //__platform_printf("ca_str:%s\r\n",ca);
     obj_setStr(self, "ca_str", ca);
     mqtt_set_ca(_client, obj_getStr(self, "ca_str"));
 
@@ -254,12 +280,8 @@ int _mqtt__MQTT_setHost(PikaObj* self, char* host_url) {
         return -2;
     }
 
-    obj_setStr(self, "host_str",
-               host_url);  // python 环境创建一个全局变量存放 host
-    mqtt_set_host(
-        _client,
-        obj_getStr(self,
-                   "host_str"));  //从python环境中取出 host的指针 赋值给结构体
+    obj_setStr(self, "host_str",host_url);  // python 环境创建一个全局变量存放 host
+    mqtt_set_host(_client,obj_getStr(self,"host_str"));  //从python环境中取出 host的指针 赋值给结构体
     __platform_printf("MQTT_setHost :%s\r\n", host_url);
 
     return 0;
@@ -385,7 +407,7 @@ int _mqtt__MQTT_setVersion(PikaObj* self, char* version) {
 
 ////////////////////////////////////////////////////////////////////
 // 函 数 名：_mqtt__MQTT_setWill
-// 功能说明：
+// 功能说明：设置遗嘱消息，异常断连时会发送这个消息
 // 输入参数：
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
@@ -417,9 +439,9 @@ int _mqtt__MQTT_setWill(PikaObj* self,
     ret = mqtt_set_will_options(_client, topic, qos, (uint8_t)retain, payload);
 
     if (ret == 0) {
-        __platform_printf("MQTT_setWill success\r\n", topic);
+        __platform_printf("MQTT_setWill OK\r\n", topic);
     } else
-        __platform_printf("MQTT_setWill error\r\n");
+        __platform_printf("MQTT_setWill ERROR\r\n");
 
     return 0;
 }
@@ -432,14 +454,6 @@ int _mqtt__MQTT_setWill(PikaObj* self,
 ///////////////////////////////////////////////////////////////////
 int _mqtt__MQTT_subscribe(PikaObj* self, char* topic, int qos, Arg* cb) {
     mqtt_client_t* _client = obj_getPtr(self, "_client");
-    obj_setArg(self, "eventCallBack", cb);
-    /* init event_listener for the first time */
-    if (NULL == g_mqtt_event_listener) {
-        pks_eventLisener_init(&g_mqtt_event_listener);
-    }
-    uint32_t eventId = hash_time33(topic);
-    pks_eventLicener_registEvent(g_mqtt_event_listener, eventId, self);
-
     int ret;
 
     if (strlen(topic) <= 0) {
@@ -451,13 +465,21 @@ int _mqtt__MQTT_subscribe(PikaObj* self, char* topic, int qos, Arg* cb) {
         __platform_printf("input qos error\r\n");
         return -1;
     }
+    
+    obj_setArg(self, "eventCallBack", cb);
+    /* init event_listener for the first time */
+    if (NULL == g_mqtt_event_listener) {
+        pks_eventLisener_init(&g_mqtt_event_listener);
+    }
+    uint32_t eventId = hash_time33(topic);
+    pks_eventLicener_registEvent(g_mqtt_event_listener, eventId, self);
 
     ret = mqtt_subscribe(_client, topic, qos, Subscribe_Handler);
 
     if (ret == 0) {
-        __platform_printf("MQTT_subscribe Topic :%s success\r\n", topic);
+        __platform_printf("MQTT_subscribe Topic :%s OK\r\n", topic);
     } else
-        __platform_printf("MQTT_subscribe Topic error\r\n");
+        __platform_printf("MQTT_subscribe Topic ERROR\r\n");
 
     return 0;
 }
@@ -479,16 +501,16 @@ int _mqtt__MQTT_unsubscribe(PikaObj* self, char* topic) {
 
     ret = mqtt_unsubscribe(_client, topic);
     if (ret == 0) {
-        __platform_printf("MQTT_unsubscribe :%s success\r\n", topic);
+        __platform_printf("MQTT_unsubscribe :%s OK\r\n", topic);
     } else
-        __platform_printf("MQTT_unsubscribe :%s error\r\n", topic);
+        __platform_printf("MQTT_unsubscribe :%s ERROR\r\n", topic);
 
     return 0;
 }
 
 ////////////////////////////////////////////////////////////////////
-// 函 数 名：_mqtt__MQTT_unsubscribe
-// 功能说明：取消mqtt 订阅主题
+// 函 数 名：Subscribe_Handler
+// 功能说明：mqtt 订阅主题 的回调函数
 // 输入参数：
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
diff --git a/port/linux/package/pikascript/_mqtt.pyi b/port/linux/package/pikascript/_mqtt.pyi
index 305ad1bd0..7f6759bd5 100644
--- a/port/linux/package/pikascript/_mqtt.pyi
+++ b/port/linux/package/pikascript/_mqtt.pyi
@@ -54,7 +54,7 @@ class _MQTT:
         pass
         """listSubscribrTopic """
 
-    def publish(self, topic: str, payload: str) -> int:
+    def publish(self, qos:int, topic: str, payload: str) -> int:
         pass
         """publish to the mqtt-server."""
 
diff --git a/port/linux/package/pikascript/pikascript-lib/mqtt/_mqtt__MQTT.c b/port/linux/package/pikascript/pikascript-lib/mqtt/_mqtt__MQTT.c
index 98332b48d..74fbeab83 100644
--- a/port/linux/package/pikascript/pikascript-lib/mqtt/_mqtt__MQTT.c
+++ b/port/linux/package/pikascript/pikascript-lib/mqtt/_mqtt__MQTT.c
@@ -32,6 +32,9 @@ void _mqtt__MQTT___init__(PikaObj* self,
         obj_setStr(self, "host_str", ip);
         mqtt_set_host(_client, obj_getStr(self, "host_str"));
     }
+    else {
+        __platform_printf("mqtt_init input ip none\r\n");
+    }
 
     memset(port_str, 0, sizeof(port_str));
     __platform_sprintf(port_str, "%d", port);
@@ -42,30 +45,48 @@ void _mqtt__MQTT___init__(PikaObj* self,
         obj_setStr(self, "id_str", clinetID);
         mqtt_set_client_id(_client, obj_getStr(self, "id_str"));
     }
+    else {
+        __platform_printf("mqtt_init input clinetID none\r\n");
+    }
 
     if (strlen(username) > 0) {
         obj_setStr(self, "username_str", username);
         mqtt_set_user_name(_client, obj_getStr(self, "username_str"));
     }
+    else {
+        __platform_printf("mqtt_init input username none\r\n");
+    }
 
     if (strlen(password) > 0) {
         obj_setStr(self, "password_str", password);
         mqtt_set_password(_client, obj_getStr(self, "password_str"));
     }
+    else {
+        __platform_printf("mqtt_init input password none\r\n");
+    }
 
     tmp = atoi(version);
     if (tmp > 0) {
         mqtt_set_version(_client, tmp);
     }
+    else {
+        __platform_printf("mqtt_init input version none\r\n");
+    }
 
     if (strlen(ca) > 0) {
         obj_setStr(self, "ca_str", ca);
         mqtt_set_ca(_client, obj_getStr(self, "ca_str"));
     }
+    else {
+        __platform_printf("mqtt_init input ca none\r\n");
+    }
 
     if (keepalive > 0) {
         mqtt_set_keep_alive_interval(_client, keepalive);
     }
+    else {
+        __platform_printf("mqtt_init input keepalive none\r\n");
+    }
 
     mqtt_set_clean_session(_client, 1);
 
@@ -130,7 +151,7 @@ int _mqtt__MQTT_disconnect(PikaObj* self) {
         __platform_printf("mqtt disconnect ERROR! :%d\r\n", ret);
 
     if (ret == 0)
-        __platform_printf("mqtt disconnect Done\r\n");
+        __platform_printf("mqtt disconnect OK\r\n");
     return ret;
 }
 
@@ -146,9 +167,9 @@ PikaObj* _mqtt__MQTT_listSubscribrTopic(PikaObj* self) {
 
     ret = mqtt_list_subscribe_topic(_client);
     if (ret == 0)
-        __platform_printf("MQTT_listSubscribrTopic Done\r\n");
+        __platform_printf("MQTT_listSubscribrTopic OK\r\n");
     else
-        __platform_printf("MQTT_listSubscribrTopic error\r\n");
+        __platform_printf("MQTT_listSubscribrTopic ERROR\r\n");
 
     return NULL;
 }
@@ -159,30 +180,35 @@ PikaObj* _mqtt__MQTT_listSubscribrTopic(PikaObj* self) {
 // 输入参数：主题名称，有效数据
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
-int _mqtt__MQTT_publish(PikaObj* self, char* topic, char* payload) {
+int _mqtt__MQTT_publish(PikaObj *self, int qos, char* topic, char* payload) {
     int ret;
     mqtt_message_t msg;
 
     mqtt_client_t* _client = obj_getPtr(self, "_client");
     memset(&msg, 0, sizeof(msg));
 
+    if((qos < 0) || (qos > 2)) {
+        __platform_printf("input qos error\r\n");
+        return -1;
+    }
     if (strlen(topic) <= 0) {
         __platform_printf("input topic error\r\n");
-        return -1;
+        return -2;
     }
 
     if (strlen(payload) <= 0) {
         __platform_printf("input payload error\r\n");
-        return -2;
+        return -3;
     }
 
     msg.payload = (void*)payload;
-    msg.qos = 1;
+    msg.qos = qos;
+    __platform_printf("msg.qos:%d\r\n",msg.qos);
     ret = mqtt_publish(_client, topic, &msg);
     if (ret == 0)
-        __platform_printf("MQTT_publish Done\r\n");
+        __platform_printf("MQTT_publish OK\r\n");
     else
-        __platform_printf("MQTT_publish error\r\n");
+        __platform_printf("MQTT_publish ERROR\r\n");
     return ret;
 }
 
@@ -203,7 +229,7 @@ int _mqtt__MQTT_setCa(PikaObj* self, char* ca) {
         __platform_printf("input ca data error\r\n");
         return -2;
     }
-
+    //__platform_printf("ca_str:%s\r\n",ca);
     obj_setStr(self, "ca_str", ca);
     mqtt_set_ca(_client, obj_getStr(self, "ca_str"));
 
@@ -254,12 +280,8 @@ int _mqtt__MQTT_setHost(PikaObj* self, char* host_url) {
         return -2;
     }
 
-    obj_setStr(self, "host_str",
-               host_url);  // python 环境创建一个全局变量存放 host
-    mqtt_set_host(
-        _client,
-        obj_getStr(self,
-                   "host_str"));  //从python环境中取出 host的指针 赋值给结构体
+    obj_setStr(self, "host_str",host_url);  // python 环境创建一个全局变量存放 host
+    mqtt_set_host(_client,obj_getStr(self,"host_str"));  //从python环境中取出 host的指针 赋值给结构体
     __platform_printf("MQTT_setHost :%s\r\n", host_url);
 
     return 0;
@@ -385,7 +407,7 @@ int _mqtt__MQTT_setVersion(PikaObj* self, char* version) {
 
 ////////////////////////////////////////////////////////////////////
 // 函 数 名：_mqtt__MQTT_setWill
-// 功能说明：
+// 功能说明：设置遗嘱消息，异常断连时会发送这个消息
 // 输入参数：
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
@@ -417,9 +439,9 @@ int _mqtt__MQTT_setWill(PikaObj* self,
     ret = mqtt_set_will_options(_client, topic, qos, (uint8_t)retain, payload);
 
     if (ret == 0) {
-        __platform_printf("MQTT_setWill success\r\n", topic);
+        __platform_printf("MQTT_setWill OK\r\n", topic);
     } else
-        __platform_printf("MQTT_setWill error\r\n");
+        __platform_printf("MQTT_setWill ERROR\r\n");
 
     return 0;
 }
@@ -432,14 +454,6 @@ int _mqtt__MQTT_setWill(PikaObj* self,
 ///////////////////////////////////////////////////////////////////
 int _mqtt__MQTT_subscribe(PikaObj* self, char* topic, int qos, Arg* cb) {
     mqtt_client_t* _client = obj_getPtr(self, "_client");
-    obj_setArg(self, "eventCallBack", cb);
-    /* init event_listener for the first time */
-    if (NULL == g_mqtt_event_listener) {
-        pks_eventLisener_init(&g_mqtt_event_listener);
-    }
-    uint32_t eventId = hash_time33(topic);
-    pks_eventLicener_registEvent(g_mqtt_event_listener, eventId, self);
-
     int ret;
 
     if (strlen(topic) <= 0) {
@@ -451,13 +465,21 @@ int _mqtt__MQTT_subscribe(PikaObj* self, char* topic, int qos, Arg* cb) {
         __platform_printf("input qos error\r\n");
         return -1;
     }
+    
+    obj_setArg(self, "eventCallBack", cb);
+    /* init event_listener for the first time */
+    if (NULL == g_mqtt_event_listener) {
+        pks_eventLisener_init(&g_mqtt_event_listener);
+    }
+    uint32_t eventId = hash_time33(topic);
+    pks_eventLicener_registEvent(g_mqtt_event_listener, eventId, self);
 
     ret = mqtt_subscribe(_client, topic, qos, Subscribe_Handler);
 
     if (ret == 0) {
-        __platform_printf("MQTT_subscribe Topic :%s success\r\n", topic);
+        __platform_printf("MQTT_subscribe Topic :%s OK\r\n", topic);
     } else
-        __platform_printf("MQTT_subscribe Topic error\r\n");
+        __platform_printf("MQTT_subscribe Topic ERROR\r\n");
 
     return 0;
 }
@@ -479,16 +501,16 @@ int _mqtt__MQTT_unsubscribe(PikaObj* self, char* topic) {
 
     ret = mqtt_unsubscribe(_client, topic);
     if (ret == 0) {
-        __platform_printf("MQTT_unsubscribe :%s success\r\n", topic);
+        __platform_printf("MQTT_unsubscribe :%s OK\r\n", topic);
     } else
-        __platform_printf("MQTT_unsubscribe :%s error\r\n", topic);
+        __platform_printf("MQTT_unsubscribe :%s ERROR\r\n", topic);
 
     return 0;
 }
 
 ////////////////////////////////////////////////////////////////////
-// 函 数 名：_mqtt__MQTT_unsubscribe
-// 功能说明：取消mqtt 订阅主题
+// 函 数 名：Subscribe_Handler
+// 功能说明：mqtt 订阅主题 的回调函数
 // 输入参数：
 // 返 回 值：0=成功；非0=错误码
 ///////////////////////////////////////////////////////////////////
diff --git a/test/mqtt-test.cpp b/test/mqtt-test.cpp
index e88181436..b7c17a59b 100644
--- a/test/mqtt-test.cpp
+++ b/test/mqtt-test.cpp
@@ -108,4 +108,43 @@ TEST(mqtt, connect) {
 }
 #endif
 
+#if 1
+//! Mqtt set_para will break the gichub actions, 
+//! if need to test, please enable it manually.
+TEST(mqtt, set_para) {
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    pikaVM_runSingleFile(pikaMain, "test/python/mqtt/mqtt_set_para.py");
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+#endif
+
+#if 1
+//! Mqtt publish will break the gichub actions, 
+//! if need to test, please enable it manually.
+TEST(mqtt, publish) {
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    pikaVM_runSingleFile(pikaMain, "test/python/mqtt/mqtt_publish.py");
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+#endif
+
+#if 0
+//! Mqtt subscribe will break the gichub actions, 
+//! if need to test, please enable it manually.
+TEST(mqtt, subscribe) {
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    pikaVM_runSingleFile(pikaMain, "test/python/mqtt/mqtt_subscribe.py");
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+#endif
+
 #endif
diff --git a/test/python/mqtt/mqtt_connect.py b/test/python/mqtt/mqtt_connect.py
index 06b4f8805..108c5e855 100644
--- a/test/python/mqtt/mqtt_connect.py
+++ b/test/python/mqtt/mqtt_connect.py
@@ -1,28 +1,9 @@
 import mqtt
 
-client = mqtt.MQTT('192.168.1.255')
-
-client.setHost('broker.emqx.io')
-client.setPort(1883)
-client.setClientID('123456dddecetdc')
-client.setUsername('test1')
-client.setPassword('aabbccdd')
-client.setVersion('4')
-client.setKeepAlive('10')
+client = mqtt.MQTT('11111',port=1883,clinetID='clientid',username='name_',password='passwd_')
 
 ret = client.connect()
 print("ret:%d" % ret)
 
-client.publish('topic1234', 'hello pikascript')
-
-
-def callback1(signal):
-    print("py cb: %s:%s" % (client.recv_topic, client.recv_msg))
-
-
-ret = client.subscribe('topic', 1, callback1)
-
-client.listSubscribrTopic()
-
-#ret = client.disconnect()
-#print("ret:%d" % ret)
+ret = client.disconnect()
+print("ret:%d" % ret)
diff --git a/test/python/mqtt/mqtt_publish.py b/test/python/mqtt/mqtt_publish.py
new file mode 100644
index 000000000..498a884f4
--- /dev/null
+++ b/test/python/mqtt/mqtt_publish.py
@@ -0,0 +1,21 @@
+import mqtt
+
+client = mqtt.MQTT('192.168.1.255')
+
+client.setHost('broker.emqx.io')
+client.setPort(1883)
+client.setClientID('123456dddecetdc')
+client.setUsername('test1')
+client.setPassword('aabbccdd')
+client.setVersion('3')
+client.setKeepAlive('10')
+
+ret = client.connect()
+print("ret:%d" % ret)
+
+client.publish(0,'topic_pikapy', 'hello pikascript qos=0')
+client.publish(1,'topic_pikapy', 'hello pikascript qos=1')
+client.publish(2,'topic_pikapy', 'hello pikascript qos=2')
+
+ret = client.disconnect()
+print("ret:%d" % ret)
\ No newline at end of file
diff --git a/test/python/mqtt/mqtt_set_para.py b/test/python/mqtt/mqtt_set_para.py
new file mode 100644
index 000000000..27ddb9d29
--- /dev/null
+++ b/test/python/mqtt/mqtt_set_para.py
@@ -0,0 +1,45 @@
+import mqtt
+
+test_baidu_ca_crt = ["-----BEGIN CERTIFICATE-----\r\n"
+    "MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G\r\n"
+    "A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp\r\n"
+    "Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4\r\n"
+    "MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG\r\n"
+    "A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI\r\n"
+    "hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8\r\n"
+    "RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT\r\n"
+    "gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm\r\n"
+    "KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd\r\n"
+    "QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ\r\n"
+    "XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw\r\n"
+    "DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o\r\n"
+    "LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU\r\n"
+    "RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp\r\n"
+    "jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK\r\n"
+    "6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX\r\n"
+    "mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs\r\n"
+    "Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH\r\n"
+    "WD9f\r\n"
+    "-----END CERTIFICATE-----"]
+
+client = mqtt.MQTT('192.168.1.255')
+
+#test TLS
+# client.setHost('j6npr4w.mqtt.iot.gz.baidubce.com')
+# client.setPort(1884)
+# client.setCa(test_baidu_ca_crt)
+
+client.setHost('broker.emqx.io')
+client.setPort(1883)
+
+client.setClientID('123456dddecetdc')
+client.setUsername('j6npr4w/mqtt-client-dev')
+client.setPassword('lcUhUs5VYLMSbrnB')
+client.setVersion('3')
+client.setKeepAlive('10')
+
+ret = client.connect()
+print("ret:%d" % ret)
+
+ret = client.disconnect()
+print("ret:%d" % ret)
\ No newline at end of file
diff --git a/test/python/mqtt/mqtt_subscribe.py b/test/python/mqtt/mqtt_subscribe.py
new file mode 100644
index 000000000..b573ad81c
--- /dev/null
+++ b/test/python/mqtt/mqtt_subscribe.py
@@ -0,0 +1,28 @@
+import mqtt
+
+client = mqtt.MQTT('192.168.1.255')
+
+client.setHost('broker.emqx.io')
+client.setPort(1883)
+client.setClientID('123456dddecetdc')
+client.setUsername('test1')
+client.setPassword('aabbccdd')
+client.setVersion('4')
+client.setKeepAlive('10')
+
+ret = client.connect()
+print("ret:%d" % ret)
+
+client.publish('topic1234', 'hello pikascript')
+
+
+def callback1(signal):
+    print("py cb: %s:%s" % (client.recv_topic, client.recv_msg))
+
+
+ret = client.subscribe('topic', 1, callback1)
+
+client.listSubscribrTopic()
+
+#ret = client.disconnect()
+#print("ret:%d" % ret)
\ No newline at end of file