diff --git a/TC1/main.c b/TC1/main.c
index 055fd71..135373b 100644
--- a/TC1/main.c
+++ b/TC1/main.c
@@ -49,7 +49,19 @@ void appRestoreDefault_callback( void * const user_config_data, uint32_t size )
     {
         userConfigDefault->plug[i].idx = -1;
         userConfigDefault->plug[i].on = 1;
-        sprintf( userConfigDefault->plug[i].name, "插座%d", i );
+
+        //插座名称 插口1-6
+        userConfigDefault->plug[i].name[0]=0xe6;
+        userConfigDefault->plug[i].name[1]=0x8f;
+        userConfigDefault->plug[i].name[2]=0x92;
+        userConfigDefault->plug[i].name[3]=0xe5;
+        userConfigDefault->plug[i].name[4]=0x8f;
+        userConfigDefault->plug[i].name[5]=0xa3;
+        userConfigDefault->plug[i].name[6]=i+'1';
+        userConfigDefault->plug[i].name[7]=0;
+
+
+//        sprintf( userConfigDefault->plug[i].name, "插座%d", i );//编码异常
         for ( j = 0; j < PLUG_TIME_TASK_NUM; j++ )
         {
             userConfigDefault->plug[i].task[j].hour = 0;
diff --git a/TC1/user_function.c b/TC1/user_function.c
index 3569f4c..88400c0 100644
--- a/TC1/user_function.c
+++ b/TC1/user_function.c
@@ -288,50 +288,50 @@ bool json_plug_analysis( int udp_flag, char x, cJSON * pJsonRoot, cJSON * pJsonS
                 }
             }
 
-
         }
 
-    //解析plug中setting项目----------------------------------------------
-    cJSON *p_plug_setting = cJSON_GetObjectItem( p_plug, "setting" );
-    if ( p_plug_setting )
-    {
-        cJSON *json_plug_setting_send = cJSON_CreateObject( );
-        //解析plug中setting中name----------------------------------------
-        cJSON *p_plug_setting_name = cJSON_GetObjectItem( p_plug_setting, "name" );
-        if ( p_plug_setting_name )
+        //解析plug中setting项目----------------------------------------------
+        cJSON *p_plug_setting = cJSON_GetObjectItem( p_plug, "setting" );
+        if ( p_plug_setting )
         {
-            if ( cJSON_IsString( p_plug_setting_name ) )
+            cJSON *json_plug_setting_send = cJSON_CreateObject( );
+            //解析plug中setting中name----------------------------------------
+            cJSON *p_plug_setting_name = cJSON_GetObjectItem( p_plug_setting, "name" );
+            if ( p_plug_setting_name )
             {
-                return_flag = true;
-                sprintf( user_config->plug[x].name, p_plug_setting_name->valuestring );
+                if ( cJSON_IsString( p_plug_setting_name ) )
+                {
+                    return_flag = true;
+                    sprintf( user_config->plug[x].name, p_plug_setting_name->valuestring );
+                }
+                cJSON_AddStringToObject( json_plug_setting_send, "name", user_config->plug[x].name );
             }
-            cJSON_AddStringToObject( json_plug_setting_send, "name", user_config->plug[x].name );
-        }
 
-        //解析plug中setting中idx----------------------------------------
-        cJSON *p_plug_setting_idx = cJSON_GetObjectItem( p_plug_setting, "idx" );
-        if ( p_plug_setting_idx )
-        {
-            if ( cJSON_IsNumber( p_plug_setting_idx ) )
+            //解析plug中setting中idx----------------------------------------
+            cJSON *p_plug_setting_idx = cJSON_GetObjectItem( p_plug_setting, "idx" );
+            if ( p_plug_setting_idx )
             {
-                return_flag = true;
-                user_config->plug[x].idx = p_plug_setting_idx->valueint;
+                if ( cJSON_IsNumber( p_plug_setting_idx ) )
+                {
+                    return_flag = true;
+                    user_config->plug[x].idx = p_plug_setting_idx->valueint;
+                }
+                cJSON_AddNumberToObject( json_plug_setting_send, "idx", user_config->plug[x].idx );
             }
-            cJSON_AddNumberToObject( json_plug_setting_send, "idx", user_config->plug[x].idx );
-        }
 
-        //解析plug中setting中task----------------------------------------
-        for ( i = 0; i < PLUG_TIME_TASK_NUM; i++ )
-        {
-            if ( json_plug_task_analysis( x, i, p_plug_setting, json_plug_setting_send ) )
-                return_flag = true;
-        }
+            //解析plug中setting中task----------------------------------------
+            for ( i = 0; i < PLUG_TIME_TASK_NUM; i++ )
+            {
+                if ( json_plug_task_analysis( x, i, p_plug_setting, json_plug_setting_send ) )
+                    return_flag = true;
+            }
 
-        cJSON_AddItemToObject( json_plug_send, "setting", json_plug_setting_send );
+            cJSON_AddItemToObject( json_plug_send, "setting", json_plug_setting_send );
+        }
     }
-}
-        cJSON *p_nvalue = cJSON_GetObjectItem( pJsonRoot, "nvalue" );
-        if ( p_plug || p_nvalue )cJSON_AddNumberToObject( json_plug_send, "on", user_config->plug[x].on );
+    cJSON *p_nvalue = cJSON_GetObjectItem( pJsonRoot, "nvalue" );
+//    if ( p_plug || p_nvalue )
+        cJSON_AddNumberToObject( json_plug_send, "on", user_config->plug[x].on );
 
     cJSON_AddItemToObject( pJsonSend, plug_str, json_plug_send );
     return return_flag;