diff --git a/TestData/setting/widget_setting_test_data.py b/TestData/setting/widget_setting_test_data.py
index 05ddd6e571c17ef6c0f5f4fdfa2813c1bafb2e8d..fd013dd4b3fd4bcf79246d7ea389caa8de5a0866 100644
--- a/TestData/setting/widget_setting_test_data.py
+++ b/TestData/setting/widget_setting_test_data.py
@@ -10,7 +10,7 @@ class widgetSettingData(Global):
     order_track_day_60 = '60'
     order_track_day_30 = '30'
     random_avatar = "{\"showType\":2,\"buserIdList\":[${userId}]}"
-    hide_avatar = "{\"showType\":1,\"buserIdList\":[${userId}]}"
+    hide_avatar = "{\"showType\":1,\"buserIdList\":[]}"
     appoint_avatar = "{\"showType\":3,\"buserIdList\":[${userId}]}"
     origin_greeting_word = 'Hi {first_name} 👋'
     greeting_word = 'autotest_greeting_word'
diff --git a/YamlCase/FAQ/article_page_setting.yaml b/YamlCase/FAQ/article_page_setting.yaml
index 04e8a6e0aba4359fe037ae406779fe49d17fdcd4..a2b8c7d277e7473df13bdf7d58297ec0ea9a6f8d 100644
--- a/YamlCase/FAQ/article_page_setting.yaml
+++ b/YamlCase/FAQ/article_page_setting.yaml
@@ -1,8 +1,8 @@
 api1:
   title: 更改FAQ页面设置
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"7238","itemId":85,"itemValue":"${newFont}","itemName":"centerFontFamily"},{"shopId":"7238","itemId":84,"itemValue":"${newStyle}","itemName":"centerChooseTheme"},{"shopId":"7238","itemId":1,"itemValue":"${newTitle}","itemName":"centerThemeTitle"},{"shopId":"7238","itemId":128,"itemValue":"${newTitleColor}","itemName":"bannerCenterThemeTitleColor"},{"shopId":"7238","itemId":88,"itemValue":"${newActionColor}","itemName":"centerCategoryNavStateColor"},{"shopId":"7238","itemId":132,"itemValue":"${newLogoColor}","itemName":"bannerCategoryIconColor"},{"shopId":"7238","itemId":133,"itemValue":"${newBackgroundColor}","itemName":"bannerPageBackground"},{"shopId":"7238","itemId":134,"itemValue":"${newTypeFontColor}","itemName":"bannerCenterCategoryTextColor"},{"shopId":"7238","itemId":141,"itemValue":"${newDisplayContactUs}","itemName":"displayContactusSwitch"},{"shopId":"7238","itemId":144,"itemValue":"${newFacebookSwitch}","itemName":"facebookMediaCheck"},{"shopId":"7238","itemId":146,"itemValue":"${newInsSwitch}","itemName":"instagramMediaCheck"},{"shopId":"7238","itemId":148,"itemValue":"${newTwitterSwitch}","itemName":"twitterMediaCheck"},{"shopId":"7238","itemId":150,"itemValue":"${newTranslateLanguage}","itemName":"helpcenterLanguage"},{"shopId":"7238","itemId":151,"itemValue":"${newSearchKeyword}","itemName":"searchSupport"},{"shopId":"7238","itemId":152,"itemValue":"${newSpecialArticleKeyword}","itemName":"frequentlyReadarticles"},{"shopId":"7238","itemId":167,"itemValue":"${newTypeKeyword}","itemName":"relatedCategory"},{"shopId":"7238","itemId":173,"itemValue":"${newFankuiKeyword}","itemName":"feedbackDescription"},{"shopId":"7238","itemId":156,"itemValue":"${NewContactUsContentKeyword}","itemName":"contactusDescription"},{"shopId":"7238","itemId":157,"itemValue":"${newChatButtonKeyword}","itemName":"chatButtonText"},{"shopId":"7238","itemId":158,"itemValue":"${newEmailButtonKeyword}","itemName":"emailusButtonText"}],"v":"202404121750"}
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"${shopId}","itemId":85,"itemValue":"${newFont}","itemName":"centerFontFamily"},{"shopId":"${shopId}","itemId":84,"itemValue":"${newStyle}","itemName":"centerChooseTheme"},{"shopId":"${shopId}","itemId":1,"itemValue":"${newTitle}","itemName":"centerThemeTitle"},{"shopId":"${shopId}","itemId":128,"itemValue":"${newTitleColor}","itemName":"bannerCenterThemeTitleColor"},{"shopId":"${shopId}","itemId":88,"itemValue":"${newActionColor}","itemName":"centerCategoryNavStateColor"},{"shopId":"${shopId}","itemId":132,"itemValue":"${newLogoColor}","itemName":"bannerCategoryIconColor"},{"shopId":"${shopId}","itemId":133,"itemValue":"${newBackgroundColor}","itemName":"bannerPageBackground"},{"shopId":"${shopId}","itemId":134,"itemValue":"${newTypeFontColor}","itemName":"bannerCenterCategoryTextColor"},{"shopId":"${shopId}","itemId":141,"itemValue":"${newDisplayContactUs}","itemName":"displayContactusSwitch"},{"shopId":"${shopId}","itemId":144,"itemValue":"${newFacebookSwitch}","itemName":"facebookMediaCheck"},{"shopId":"${shopId}","itemId":146,"itemValue":"${newInsSwitch}","itemName":"instagramMediaCheck"},{"shopId":"${shopId}","itemId":148,"itemValue":"${newTwitterSwitch}","itemName":"twitterMediaCheck"},{"shopId":"${shopId}","itemId":150,"itemValue":"${newTranslateLanguage}","itemName":"helpcenterLanguage"},{"shopId":"${shopId}","itemId":151,"itemValue":"${newSearchKeyword}","itemName":"searchSupport"},{"shopId":"${shopId}","itemId":152,"itemValue":"${newSpecialArticleKeyword}","itemName":"frequentlyReadarticles"},{"shopId":"${shopId}","itemId":167,"itemValue":"${newTypeKeyword}","itemName":"relatedCategory"},{"shopId":"${shopId}","itemId":173,"itemValue":"${newFankuiKeyword}","itemName":"feedbackDescription"},{"shopId":"${shopId}","itemId":156,"itemValue":"${NewContactUsContentKeyword}","itemName":"contactusDescription"},{"shopId":"${shopId}","itemId":157,"itemValue":"${newChatButtonKeyword}","itemName":"chatButtonText"},{"shopId":"${shopId}","itemId":158,"itemValue":"${newEmailButtonKeyword}","itemName":"emailusButtonText"}],"v":"202404121750"}
   expected:
     - eq: {"$.code" : 0}
 
@@ -35,9 +35,9 @@ api2:
 
 api3:
   title: 还原FAQ页面设置
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"7238","itemId":85,"itemValue":"${oldFont}","itemName":"centerFontFamily"},{"shopId":"7238","itemId":84,"itemValue":"${oldStyle}","itemName":"centerChooseTheme"},{"shopId":"7238","itemId":1,"itemValue":"${oldTitle}","itemName":"centerThemeTitle"},{"shopId":"7238","itemId":128,"itemValue":"${oldTitleColor}","itemName":"bannerCenterThemeTitleColor"},{"shopId":"7238","itemId":88,"itemValue":"${oldActionColor}","itemName":"centerCategoryNavStateColor"},{"shopId":"7238","itemId":132,"itemValue":"${oldLogoColor}","itemName":"bannerCategoryIconColor"},{"shopId":"7238","itemId":133,"itemValue":"${oldBackgroundColor}","itemName":"bannerPageBackground"},{"shopId":"7238","itemId":134,"itemValue":"${oldTypeFontColor}","itemName":"bannerCenterCategoryTextColor"},{"shopId":"7238","itemId":141,"itemValue":"${oldDisplayContactUs}","itemName":"displayContactusSwitch"},{"shopId":"7238","itemId":144,"itemValue":"${oldFacebookSwitch}","itemName":"facebookMediaCheck"},{"shopId":"7238","itemId":146,"itemValue":"${oldInsSwitch}","itemName":"instagramMediaCheck"},{"shopId":"7238","itemId":148,"itemValue":"${oldTwitterSwitch}","itemName":"twitterMediaCheck"},{"shopId":"7238","itemId":150,"itemValue":"${oldTranslateLanguage}","itemName":"helpcenterLanguage"},{"shopId":"7238","itemId":151,"itemValue":"${oldSearchKeyword}","itemName":"searchSupport"},{"shopId":"7238","itemId":152,"itemValue":"${oldSpecialArticleKeyword}","itemName":"frequentlyReadarticles"},{"shopId":"7238","itemId":167,"itemValue":"${oldTypeKeyword}","itemName":"relatedCategory"},{"shopId":"7238","itemId":173,"itemValue":"${oldFankuiKeyword}","itemName":"feedbackDescription"},{"shopId":"7238","itemId":156,"itemValue":"${oldContactUsContentKeyword}","itemName":"contactusDescription"},{"shopId":"7238","itemId":157,"itemValue":"${oldChatButtonKeyword}","itemName":"chatButtonText"},{"shopId":"7238","itemId":158,"itemValue":"${oldEmailButtonKeyword}","itemName":"emailusButtonText"}],"v":"202404121750"}
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"${shopId}","itemId":85,"itemValue":"${oldFont}","itemName":"centerFontFamily"},{"shopId":"${shopId}","itemId":84,"itemValue":"${oldStyle}","itemName":"centerChooseTheme"},{"shopId":"${shopId}","itemId":1,"itemValue":"${oldTitle}","itemName":"centerThemeTitle"},{"shopId":"${shopId}","itemId":128,"itemValue":"${oldTitleColor}","itemName":"bannerCenterThemeTitleColor"},{"shopId":"${shopId}","itemId":88,"itemValue":"${oldActionColor}","itemName":"centerCategoryNavStateColor"},{"shopId":"${shopId}","itemId":132,"itemValue":"${oldLogoColor}","itemName":"bannerCategoryIconColor"},{"shopId":"${shopId}","itemId":133,"itemValue":"${oldBackgroundColor}","itemName":"bannerPageBackground"},{"shopId":"${shopId}","itemId":134,"itemValue":"${oldTypeFontColor}","itemName":"bannerCenterCategoryTextColor"},{"shopId":"${shopId}","itemId":141,"itemValue":"${oldDisplayContactUs}","itemName":"displayContactusSwitch"},{"shopId":"${shopId}","itemId":144,"itemValue":"${oldFacebookSwitch}","itemName":"facebookMediaCheck"},{"shopId":"${shopId}","itemId":146,"itemValue":"${oldInsSwitch}","itemName":"instagramMediaCheck"},{"shopId":"${shopId}","itemId":148,"itemValue":"${oldTwitterSwitch}","itemName":"twitterMediaCheck"},{"shopId":"${shopId}","itemId":150,"itemValue":"${oldTranslateLanguage}","itemName":"helpcenterLanguage"},{"shopId":"${shopId}","itemId":151,"itemValue":"${oldSearchKeyword}","itemName":"searchSupport"},{"shopId":"${shopId}","itemId":152,"itemValue":"${oldSpecialArticleKeyword}","itemName":"frequentlyReadarticles"},{"shopId":"${shopId}","itemId":167,"itemValue":"${oldTypeKeyword}","itemName":"relatedCategory"},{"shopId":"${shopId}","itemId":173,"itemValue":"${oldFankuiKeyword}","itemName":"feedbackDescription"},{"shopId":"${shopId}","itemId":156,"itemValue":"${oldContactUsContentKeyword}","itemName":"contactusDescription"},{"shopId":"${shopId}","itemId":157,"itemValue":"${oldChatButtonKeyword}","itemName":"chatButtonText"},{"shopId":"${shopId}","itemId":158,"itemValue":"${oldEmailButtonKeyword}","itemName":"emailusButtonText"}],"v":"202404121750"}
   expected:
     - eq: {"$.code" : 0}
 
diff --git a/YamlCase/setting/notification.yaml b/YamlCase/setting/notification.yaml
index 1603f9b855e90e099abc1006c39a5bdcdc2aed95..885d6ce0180add21bac28d31a443a66c4b4b25fa 100644
--- a/YamlCase/setting/notification.yaml
+++ b/YamlCase/setting/notification.yaml
@@ -1,8 +1,8 @@
 api1:
   title: 关闭所有消息通知
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"itemId":102,"itemName":"messageNotifyToAll","itemValue":"0","shopId":"0"},{"itemId":103,"itemName":"messageNotifyToTeam","itemValue":"0","shopId":"0"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"itemId":102,"itemName":"messageNotifyToAll","itemValue":"0","shopId":"0"},{"itemId":103,"itemName":"messageNotifyToTeam","itemValue":"0","shopId":"0"}],"v":"${v}"}
   expected:
     - eq: {"$.code": 0}
 
@@ -17,9 +17,9 @@ api2:
 
 api3:
   title: 开启仅针对分配给您的团队的通知
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"itemId":102,"itemName":"messageNotifyToAll","itemValue":"0","shopId":"0"},{"itemId":103,"itemName":"messageNotifyToTeam","itemValue":"1","shopId":"0"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"itemId":102,"itemName":"messageNotifyToAll","itemValue":"0","shopId":"0"},{"itemId":103,"itemName":"messageNotifyToTeam","itemValue":"1","shopId":"0"}],"v":"${v}"}
   expected:
     - eq: {"$.code": 0}
 
@@ -34,9 +34,9 @@ api4:
 
 api5:
   title: 开启所有消息通知
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"itemId":102,"itemName":"messageNotifyToAll","itemValue":"1","shopId":"0"},{"itemId":103,"itemName":"messageNotifyToTeam","itemValue":"0","shopId":"0"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"itemId":102,"itemName":"messageNotifyToAll","itemValue":"1","shopId":"0"},{"itemId":103,"itemName":"messageNotifyToTeam","itemValue":"0","shopId":"0"}],"v":"${v}"}
   expected:
     - eq: {"$.code": 0}
 
diff --git a/YamlCase/setting/survey.yaml b/YamlCase/setting/survey.yaml
index e84597c1afb4f809f5a4e7ea25e4e6db3a5decdb..ed782625cdb15fa913cf8ae7a4a89dfd88a316d3 100644
--- a/YamlCase/setting/survey.yaml
+++ b/YamlCase/setting/survey.yaml
@@ -1,8 +1,8 @@
 api1:
   title: 关闭评分推送
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"0","itemId":76,"itemValue":"false","itemName":"askSendReview"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"0","itemId":76,"itemValue":"false","itemName":"askSendReview"}],"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
 
@@ -16,9 +16,9 @@ api2:
 
 api3:
   title: 开启评分推送
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"0","itemId":76,"itemValue":"true","itemName":"askSendReview"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"0","itemId":76,"itemValue":"true","itemName":"askSendReview"}],"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
 
@@ -33,9 +33,9 @@ api4:
 
 api5:
   title: 更新评分推送里的文案、评分样式
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"${shopId}","itemId":78,"itemValue":"${survey_content}","itemName":"reviewContent"},{"shopId":"${shopId}","itemId":81,"itemValue":"star","itemName":"reviewChoose"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"${shopId}","itemId":78,"itemValue":"${survey_content}","itemName":"reviewContent"},{"shopId":"${shopId}","itemId":81,"itemValue":"star","itemName":"reviewChoose"}],"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
 
@@ -51,9 +51,9 @@ api6:
 
 api7:
   title: 还原评分推送里的文案、评分样式
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"${shopId}","itemId":78,"itemValue":"${origin_survey_content}","itemName":"reviewContent"},{"shopId":"${shopId}","itemId":81,"itemValue":"thumbs","itemName":"reviewChoose"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"${shopId}","itemId":78,"itemValue":"${origin_survey_content}","itemName":"reviewContent"},{"shopId":"${shopId}","itemId":81,"itemValue":"thumbs","itemName":"reviewChoose"}],"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
 
diff --git a/YamlCase/setting/widgetSetting.yaml b/YamlCase/setting/widgetSetting.yaml
index eb6f6bd11f928635631b06f1e02f776c123837a2..e9e7d7157e21108f81c620e9380b905b25e96b5a 100644
--- a/YamlCase/setting/widgetSetting.yaml
+++ b/YamlCase/setting/widgetSetting.yaml
@@ -1,141 +1,145 @@
 api1:
   title: 更改挂件设置
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"${shopId}","itemId":71,"itemValue":"${disable}","itemName":"mainSwitch"},{"shopId":"${shopId}","itemId":37,"itemValue":"${disable}","itemName":"enableLiveChat"},{"shopId":"${shopId}","itemId":39,"itemValue":"${disable}","itemName":"whatsApp"},{"shopId":"${shopId}","itemId":38,"itemValue":"${disable}","itemName":"displayContactForm"},{"shopId":"${shopId}","itemId":42,"itemValue":"${disable}","itemName":"orderTrack"},{"shopId":"${shopId}","itemId":49,"itemValue":"${disable}","itemName":"showFaq"},{"shopId":"${shopId}","itemId":183,"itemValue":"${appoint_avatar}","itemName":"agentAvatarSettings"},{"shopId":"${shopId}","itemId":56,"itemValue":"${greeting_word}","itemName":"welcomeGreetings"},{"shopId":"${shopId}","itemId":57,"itemValue":"${team_introduction}","itemName":"welcomeIntroduction"},{"shopId":"${shopId}","itemId":59,"itemValue":"${disable}","itemName":"welcomeDisplay"},{"shopId":"${shopId}","itemId":52,"itemValue":"${black_font}","itemName":"textColor"},{"shopId":"${shopId}","itemId":53,"itemValue":"${widget_left}","itemName":"launcherPosition"},{"shopId":"${shopId}","itemId":94,"itemValue":"${font_style}","itemName":"fontStyle"},{"shopId":"${shopId}","itemId":50,"itemValue":"${background_color}","itemName":"primaryColor"},{"shopId":"${shopId}","itemId":60,"itemValue":"${posting_title}","itemName":"welcomeTitle"},{"shopId":"${shopId}","itemId":61,"itemValue":"${posting_content}","itemName":"welcomeContent"},{"shopId":"${shopId}","itemId":93,"itemValue":"${posting_button_content}","itemName":"welcomeMessageUs"},{"shopId":"${shopId}","itemId":54,"itemValue":"${side_spacing_px}","itemName":"sideSpacing"},{"shopId":"${shopId}","itemId":55,"itemValue":"${bottom_spacing_px}","itemName":"bottomSpacing"},{"shopId":"${shopId}","itemId":58,"itemValue":"${widget_font}","itemName":"welcomeCTA"},{"shopId":"${shopId}","itemId":113,"itemValue":"${widget_type}","itemName":"buttonType"},{"shopId":"${shopId}","itemId":116,"itemValue":"${widget_medium}","itemName":"iconSize"},{"shopId":"${shopId}","itemId":66,"itemValue":"${business_time_zone}","itemName":"businessTimeZone"},{"shopId":"${shopId}","itemId":73,"itemValue":"${chatwelcome_message}","itemName":"chatWelcomeMsg"},{"shopId":"${shopId}","itemId":69,"itemValue":"${disable}","itemName":"visitorDataName"},{"shopId":"${shopId}","itemId":63,"itemValue":"${business_time_range}","itemName":"businessTimeRange"},{"shopId":"${shopId}","itemId":64,"itemValue":"${business_time_start}","itemName":"businessTimeStart"},{"shopId":"${shopId}","itemId":65,"itemValue":"${business_time_end}","itemName":"businessTimeEnd"},{"shopId":"${shopId}","itemId":70,"itemValue":"${disable}","itemName":"visitorDataEmail"},{"shopId":"${shopId}","itemId":83,"itemValue":"${disable}","itemName":"visitorDataPhone"},{"shopId":"${shopId}","itemId":68,"itemValue":"${disable}","itemName":"visitorDataCollection"},{"shopId":"${shopId}","itemId":106,"itemValue":"${visiable_business_time}","itemName":"visibilityTime"},{"shopId":"${shopId}","itemId":107,"itemValue":"${widget_show_desktop}","itemName":"visibilityDevices"},{"shopId":"${shopId}","itemId":108,"itemValue":"${widget_show_special_page}","itemName":"visibilityPageSetting"},{"shopId":"${shopId}","itemId":109,"itemValue":"${visiable_url}"},{"shopId":"${shopId}","itemId":82,"itemValue":"${order_track_day_14}","itemName":"trackDays"},{"shopId":"${shopId}","itemId":74,"itemValue":"${waiting_time_message}","itemName":"chatNonworkMsg"},{"shopId":"${shopId}","itemId":168,"itemValue":"${waiting_time}","itemName":"chatNonworkMsgTime"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList": [ { "shopId": "${shopId}","itemId": 71,"itemValue": "${disable}","itemName": "mainSwitch" },{ "shopId": "${shopId}","itemId": 37,"itemValue": "${disable}","itemName": "disableLiveChat" },{ "shopId": "${shopId}","itemId": 39,"itemValue": "${disable}","itemName": "whatsApp" },{ "shopId": "${shopId}","itemId": 38,"itemValue": "${disable}","itemName": "displayContactForm" },{ "shopId": "${shopId}","itemId": 42,"itemValue": "${disable}","itemName": "orderTrack" },{ "shopId": "${shopId}","itemId": 49,"itemValue": "${disable}","itemName": "showFaq" },{ "shopId": "${shopId}","itemId": 183,"itemValue": "${random_avatar}","itemName": "agentAvatarSettings" },{ "shopId": "${shopId}","itemId": 56,"itemValue": "${origin_greeting_word}","itemName": "welcomeGreetings" },{ "shopId": "${shopId}","itemId": 57,"itemValue": "${origin_team_introduction}","itemName": "welcomeIntroduction" },{ "shopId": "${shopId}","itemId": 60,"itemValue": "${origin_posting_title}","itemName": "welcomeTitle" },{ "shopId": "${shopId}","itemId": 59,"itemValue": "${disable}","itemName": "welcomeDisplay" },{ "shopId": "${shopId}","itemId": 61,"itemValue": "${origin_posting_content}","itemName": "welcomeContent" },{ "shopId": "${shopId}","itemId": 93,"itemValue": "${origin_posting_button_content}","itemName": "welcomeMessageUs" },{ "shopId": "${shopId}","itemId": 50,"itemValue": "${origin_background_color}","itemName": "primaryColor" },{ "shopId": "${shopId}","itemId": 94,"itemValue": "${origin_font_style}","itemName": "fontStyle" },{ "shopId": "${shopId}","itemId": 52,"itemValue": "${white_font}","itemName": "textColor" },{ "shopId": "${shopId}","itemId": 53,"itemValue": "${widget_right}","itemName": "launcherPosition" },{ "shopId": "${shopId}","itemId": 54,"itemValue": "${origin_spacing_px}","itemName": "sideSpacing" },{ "shopId": "${shopId}","itemId": 55,"itemValue": "${origin_spacing_px}","itemName": "bottomSpacing" },{ "shopId": "${shopId}","itemId": 113,"itemValue": "${origin_widget_type}","itemName": "buttonType" },{ "shopId": "${shopId}","itemId": 58,"itemValue": "${origin_widget_font}","itemName": "welcomeCTA" },{ "shopId": "${shopId}","itemId": 116,"itemValue": "${widget_large}","itemName": "iconSize" },{ "shopId": "${shopId}","itemId": 66,"itemValue": "${origin_business_time_zone}","itemName": "businessTimeZone" },{ "shopId": "${shopId}","itemId": 73,"itemValue": "${origin_chatwelcome_message}","itemName": "chatWelcomeMsg" },{ "shopId": "${shopId}","itemId": 63,"itemValue": "${origin_business_time}","itemName": "businessTimeRange" },{ "shopId": "${shopId}","itemId": 64,"itemValue": "${origin_business_time}","itemName": "businessTimeStart" },{ "shopId": "${shopId}","itemId": 65,"itemValue": "${origin_business_time}","itemName": "businessTimeEnd" },{ "shopId": "${shopId}","itemId": 69,"itemValue": "${disable}","itemName": "visitorDataName" },{ "shopId": "${shopId}","itemId": 70,"itemValue": "${disable}","itemName": "visitorDataEmail" },{ "shopId": "${shopId}","itemId": 83,"itemValue": "${disable}","itemName": "visitorDataPhone" },{ "shopId": "${shopId}","itemId": 68,"itemValue": "${disable}","itemName": "visitorDataCollection" },{ "shopId": "${shopId}","itemId": 106,"itemValue": "${visiable_all_time}","itemName": "visibilityTime" },{ "shopId": "${shopId}","itemId": 107,"itemValue": "${widget_show_all}","itemName": "visibilityDevices" },{ "shopId": "${shopId}","itemId": 108,"itemValue": "${widget_show_all_page}","itemName": "visibilityPageSetting" },{ "shopId": "${shopId}","itemId": 82,"itemValue": "${order_track_day_30}","itemName": "trackDays" },{ "shopId": "${shopId}","itemId": 74,"itemValue": "${origin_waiting_time_message}","itemName": "chatNonworkMsg" },{ "shopId": "${shopId}","itemId": 168,"itemValue": "${origin_waiting_time}","itemName": "chatNonworkMsgTime" } ],"v": "${v}" }
   expected:
     - eq: {"$.code" : 0}
 
 api2:
   title: 检查设置是否成功
-  url: /api/v1/setting/getCShopSetting?domain=${shopDomain}
-  method: get
+  url: api/v1/setting/local/getShopSetting
+  method: post
+  data: {"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
-    - eq: {"$.data.settingInfo[?(@.itemId == 71)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 37)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 39)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 38)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 42)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 49)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 183)].itemValue" : "${appoint_avatar}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 56)].itemValue" : "${greeting_word}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 57)].itemValue" : "${team_introduction}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 59)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 52)].itemValue" : "${black_font}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 53)].itemValue" : "${widget_left}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 94)].itemValue" : "${font_style}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 50)].itemValue" : "${background_color}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 60)].itemValue" : "${posting_title}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 61)].itemValue" : "${posting_content}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 54)].itemValue" : "${side_spacing_px}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 55)].itemValue" : "${bottom_spacing_px}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 58)].itemValue" : "${widget_font}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 113)].itemValue" : "${widget_type}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 116)].itemValue" : "${widget_medium}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 66)].itemValue" : "${business_time_zone}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 73)].itemValue" : "${chatwelcome_message}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 69)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 63)].itemValue" : "${business_time_range}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 64)].itemValue" : "${business_time_start}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 65)].itemValue" : "${business_time_end}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 70)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 83)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 68)].itemValue" : "${disable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 106)].itemValue" : "${visiable_business_time}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 107)].itemValue" : "${widget_show_desktop}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 108)].itemValue" : "${widget_show_special_page}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 109)].itemValue" : "${visiable_url}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 82)].itemValue" : "${order_track_day_14}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 74)].itemValue" : "${waiting_time_message}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 168)].itemValue" : "${waiting_time}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 71)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 37)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 39)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 38)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 42)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 49)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 183)].itemValue" : "${appoint_avatar}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 56)].itemValue" : "${greeting_word}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 57)].itemValue" : "${team_introduction}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 59)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 52)].itemValue" : "${black_font}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 53)].itemValue" : "${widget_left}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 94)].itemValue" : "${font_style}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 50)].itemValue" : "${background_color}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 60)].itemValue" : "${posting_title}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 61)].itemValue" : "${posting_content}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 54)].itemValue" : "${side_spacing_px}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 55)].itemValue" : "${bottom_spacing_px}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 58)].itemValue" : "${widget_font}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 113)].itemValue" : "${widget_type}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 116)].itemValue" : "${widget_medium}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 66)].itemValue" : "${business_time_zone}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 73)].itemValue" : "${chatwelcome_message}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 69)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 63)].itemValue" : "${business_time_range}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 64)].itemValue" : "${business_time_start}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 65)].itemValue" : "${business_time_end}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 70)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 83)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 68)].itemValue" : "${disable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 106)].itemValue" : "${visiable_business_time}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 107)].itemValue" : "${widget_show_desktop}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 108)].itemValue" : "${widget_show_special_page}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 109)].itemValue" : "${visiable_url}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 82)].itemValue" : "${order_track_day_14}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 74)].itemValue" : "${waiting_time_message}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 168)].itemValue" : "${waiting_time}"}
 
 api3:
   title: 更改挂件设置
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"${shopId}","itemId":183,"itemValue":"${hide_avatar}","itemName":"agentAvatarSettings"},{"shopId":"${shopId}","itemId":40,"itemValue":"${whatsapp_phone}","itemName":"contactNumber"},{"shopId":"${shopId}","itemId":82,"itemValue":"${order_track_day_60}","itemName":"trackDays"},{"shopId":"${shopId}","itemId":116,"itemValue":"${widget_small}","itemName":"iconSize"},{"shopId":"${shopId}","itemId":107,"itemValue":"${widget_show_mobile}","itemName":"visibilityDevices"},{"shopId":"${shopId}","itemId":108,"itemValue":"${widget_hide_special_page}","itemName":"visibilityPageSetting"}],"v": "${v}" }
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"${shopId}","itemId":183,"itemValue":"${hide_avatar}","itemName":"agentAvatarSettings"},{"shopId":"${shopId}","itemId":40,"itemValue":"${whatsapp_phone}","itemName":"contactNumber"},{"shopId":"${shopId}","itemId":82,"itemValue":"${order_track_day_60}","itemName":"trackDays"},{"shopId":"${shopId}","itemId":116,"itemValue":"${widget_small}","itemName":"iconSize"},{"shopId":"${shopId}","itemId":107,"itemValue":"${widget_show_mobile}","itemName":"visibilityDevices"},{"shopId":"${shopId}","itemId":108,"itemValue":"${widget_hide_special_page}","itemName":"visibilityPageSetting"}],"v": "${v}" }
   expected:
     - eq: {"$.code": 0 }
 
 api4:
   title: 检查设置是否成功
-  url: /api/v1/setting/getCShopSetting?domain=${shopDomain}
-  method: get
+  url: api/v1/setting/local/getShopSetting
+  method: post
+  data: {"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
-    - eq: {"$.data.settingInfo[?(@.itemId == 183)].itemValue": "${hide_avatar}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 40)].itemValue": "${whatsapp_phone}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 82)].itemValue": "${order_track_day_60}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 116)].itemValue": "${widget_small}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 107)].itemValue": "${widget_show_mobile}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 108)].itemValue": "${widget_hide_special_page}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 183)].itemValue": "${hide_avatar}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 40)].itemValue": "${whatsapp_phone}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 82)].itemValue": "${order_track_day_60}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 116)].itemValue": "${widget_small}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 107)].itemValue": "${widget_show_mobile}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 108)].itemValue": "${widget_hide_special_page}"}
 
 api5:
   title: 更改挂件设置
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"${shopId}","itemId":82,"itemValue":"${order_track_day_7}","itemName":"trackDays"}],"v": "${v}" }
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"${shopId}","itemId":82,"itemValue":"${order_track_day_7}","itemName":"trackDays"}],"v": "${v}" }
   expected:
     - eq: {"$.code": 0 }
 
 api6:
   title: 检查设置是否成功
-  url: /api/v1/setting/getCShopSetting?domain=${shopDomain}
-  method: get
+  url: api/v1/setting/local/getShopSetting
+  method: post
+  data: {"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
-    - eq: {"$.data.settingInfo[?(@.itemId == 82)].itemValue": "${order_track_day_7}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 82)].itemValue": "${order_track_day_7}"}
 
 api7:
   title: 还原挂件设置
-  url: /api/v1/setting/updateShopSetting
+  url: /api/v1/setting/local/updateShopSetting
   method: post
-  data: {"item":[{"shopId":"${shopId}","itemId":71,"itemValue":"${enable}","itemName":"mainSwitch"},{"shopId":"${shopId}","itemId":37,"itemValue":"${enable}","itemName":"enableLiveChat"},{"shopId":"${shopId}","itemId":39,"itemValue":"${enable}","itemName":"whatsApp"},{"shopId":"${shopId}","itemId":38,"itemValue":"${enable}","itemName":"displayContactForm"},{"shopId":"${shopId}","itemId":42,"itemValue":"${enable}","itemName":"orderTrack"},{"shopId":"${shopId}","itemId":49,"itemValue":"${enable}","itemName":"showFaq"},{"shopId":"${shopId}","itemId":183,"itemValue":"${random_avatar}","itemName":"agentAvatarSettings"},{"shopId":"${shopId}","itemId":56,"itemValue":"${origin_greeting_word}","itemName":"welcomeGreetings"},{"shopId":"${shopId}","itemId":57,"itemValue":"${origin_team_introduction}","itemName":"welcomeIntroduction"},{"shopId":"${shopId}","itemId":60,"itemValue":"${origin_posting_title}","itemName":"welcomeTitle"},{"shopId":"${shopId}","itemId":59,"itemValue":"${enable}","itemName":"welcomeDisplay"},{"shopId":"${shopId}","itemId":61,"itemValue":"${origin_posting_content}","itemName":"welcomeContent"},{"shopId":"${shopId}","itemId":93,"itemValue":"${origin_posting_button_content}","itemName":"welcomeMessageUs"},{"shopId":"${shopId}","itemId":50,"itemValue":"${origin_background_color}","itemName":"primaryColor"},{"shopId":"${shopId}","itemId":94,"itemValue":"${origin_font_style}","itemName":"fontStyle"},{"shopId":"${shopId}","itemId":52,"itemValue":"${white_font}","itemName":"textColor"},{"shopId":"${shopId}","itemId":53,"itemValue":"${widget_right}","itemName":"launcherPosition"},{"shopId":"${shopId}","itemId":54,"itemValue":"${origin_spacing_px}","itemName":"sideSpacing"},{"shopId":"${shopId}","itemId":55,"itemValue":"${origin_spacing_px}","itemName":"bottomSpacing"},{"shopId":"${shopId}","itemId":113,"itemValue":"${origin_widget_type}","itemName":"buttonType"},{"shopId":"${shopId}","itemId":58,"itemValue":"${origin_widget_font}","itemName":"welcomeCTA"},{"shopId":"${shopId}","itemId":116,"itemValue":"${widget_large}","itemName":"iconSize"},{"shopId":"${shopId}","itemId":66,"itemValue":"${origin_business_time_zone}","itemName":"businessTimeZone"},{"shopId":"${shopId}","itemId":73,"itemValue":"${origin_chatwelcome_message}","itemName":"chatWelcomeMsg"},{"shopId":"${shopId}","itemId":63,"itemValue":"${origin_business_time}","itemName":"businessTimeRange"},{"shopId":"${shopId}","itemId":64,"itemValue":"${origin_business_time}","itemName":"businessTimeStart"},{"shopId":"${shopId}","itemId":65,"itemValue":"${origin_business_time}","itemName":"businessTimeEnd"},{"shopId":"${shopId}","itemId":69,"itemValue":"${enable}","itemName":"visitorDataName"},{"shopId":"${shopId}","itemId":70,"itemValue":"${enable}","itemName":"visitorDataEmail"},{"shopId":"${shopId}","itemId":83,"itemValue":"${enable}","itemName":"visitorDataPhone"},{"shopId":"${shopId}","itemId":68,"itemValue":"${enable}","itemName":"visitorDataCollection"},{"shopId":"${shopId}","itemId":106,"itemValue":"${visiable_all_time}","itemName":"visibilityTime"},{"shopId":"${shopId}","itemId":107,"itemValue":"${widget_show_all}","itemName":"visibilityDevices"},{"shopId":"${shopId}","itemId":108,"itemValue":"${widget_show_all_page}","itemName":"visibilityPageSetting"},{"shopId":"${shopId}","itemId":82,"itemValue":"${order_track_day_30}","itemName":"trackDays"},{"shopId":"${shopId}","itemId":74,"itemValue":"${origin_waiting_time_message}","itemName":"chatNonworkMsg"},{"shopId":"${shopId}","itemId":168,"itemValue":"${origin_waiting_time}","itemName":"chatNonworkMsgTime"}],"v":"${v}"}
+  data: {"brandId":"${brandId}","itemList":[{"shopId":"${shopId}","itemId":71,"itemValue":"${enable}","itemName":"mainSwitch"},{"shopId":"${shopId}","itemId":37,"itemValue":"${enable}","itemName":"enableLiveChat"},{"shopId":"${shopId}","itemId":39,"itemValue":"${enable}","itemName":"whatsApp"},{"shopId":"${shopId}","itemId":38,"itemValue":"${enable}","itemName":"displayContactForm"},{"shopId":"${shopId}","itemId":42,"itemValue":"${enable}","itemName":"orderTrack"},{"shopId":"${shopId}","itemId":49,"itemValue":"${enable}","itemName":"showFaq"},{"shopId":"${shopId}","itemId":183,"itemValue":"${random_avatar}","itemName":"agentAvatarSettings"},{"shopId":"${shopId}","itemId":56,"itemValue":"${origin_greeting_word}","itemName":"welcomeGreetings"},{"shopId":"${shopId}","itemId":57,"itemValue":"${origin_team_introduction}","itemName":"welcomeIntroduction"},{"shopId":"${shopId}","itemId":60,"itemValue":"${origin_posting_title}","itemName":"welcomeTitle"},{"shopId":"${shopId}","itemId":59,"itemValue":"${enable}","itemName":"welcomeDisplay"},{"shopId":"${shopId}","itemId":61,"itemValue":"${origin_posting_content}","itemName":"welcomeContent"},{"shopId":"${shopId}","itemId":93,"itemValue":"${origin_posting_button_content}","itemName":"welcomeMessageUs"},{"shopId":"${shopId}","itemId":50,"itemValue":"${origin_background_color}","itemName":"primaryColor"},{"shopId":"${shopId}","itemId":94,"itemValue":"${origin_font_style}","itemName":"fontStyle"},{"shopId":"${shopId}","itemId":52,"itemValue":"${white_font}","itemName":"textColor"},{"shopId":"${shopId}","itemId":53,"itemValue":"${widget_right}","itemName":"launcherPosition"},{"shopId":"${shopId}","itemId":54,"itemValue":"${origin_spacing_px}","itemName":"sideSpacing"},{"shopId":"${shopId}","itemId":55,"itemValue":"${origin_spacing_px}","itemName":"bottomSpacing"},{"shopId":"${shopId}","itemId":113,"itemValue":"${origin_widget_type}","itemName":"buttonType"},{"shopId":"${shopId}","itemId":58,"itemValue":"${origin_widget_font}","itemName":"welcomeCTA"},{"shopId":"${shopId}","itemId":116,"itemValue":"${widget_large}","itemName":"iconSize"},{"shopId":"${shopId}","itemId":66,"itemValue":"${origin_business_time_zone}","itemName":"businessTimeZone"},{"shopId":"${shopId}","itemId":73,"itemValue":"${origin_chatwelcome_message}","itemName":"chatWelcomeMsg"},{"shopId":"${shopId}","itemId":63,"itemValue":"${origin_business_time}","itemName":"businessTimeRange"},{"shopId":"${shopId}","itemId":64,"itemValue":"${origin_business_time}","itemName":"businessTimeStart"},{"shopId":"${shopId}","itemId":65,"itemValue":"${origin_business_time}","itemName":"businessTimeEnd"},{"shopId":"${shopId}","itemId":69,"itemValue":"${enable}","itemName":"visitorDataName"},{"shopId":"${shopId}","itemId":70,"itemValue":"${enable}","itemName":"visitorDataEmail"},{"shopId":"${shopId}","itemId":83,"itemValue":"${enable}","itemName":"visitorDataPhone"},{"shopId":"${shopId}","itemId":68,"itemValue":"${enable}","itemName":"visitorDataCollection"},{"shopId":"${shopId}","itemId":106,"itemValue":"${visiable_all_time}","itemName":"visibilityTime"},{"shopId":"${shopId}","itemId":107,"itemValue":"${widget_show_all}","itemName":"visibilityDevices"},{"shopId":"${shopId}","itemId":108,"itemValue":"${widget_show_all_page}","itemName":"visibilityPageSetting"},{"shopId":"${shopId}","itemId":82,"itemValue":"${order_track_day_30}","itemName":"trackDays"},{"shopId":"${shopId}","itemId":74,"itemValue":"${origin_waiting_time_message}","itemName":"chatNonworkMsg"},{"shopId":"${shopId}","itemId":168,"itemValue":"${origin_waiting_time}","itemName":"chatNonworkMsgTime"}],"v":"${v}"}
   expected:
     - eq: {"$.code": 0}
 
 
 api8:
   title: 检查设置是否成功
-  url: /api/v1/setting/getCShopSetting?domain=${shopDomain}
-  method: get
+  url: api/v1/setting/local/getShopSetting
+  method: post
+  data: {"v":"${v}"}
   expected:
     - eq: {"$.code" : 0}
-    - eq: {"$.data.settingInfo[?(@.itemId == 71)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 37)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 39)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 38)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 42)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 49)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 183)].itemValue" : "${random_avatar}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 56)].itemValue" : "${origin_greeting_word}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 57)].itemValue" : "${origin_team_introduction}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 59)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 52)].itemValue" : "${white_font}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 53)].itemValue" : "${widget_right}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 94)].itemValue" : "${origin_font_style}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 50)].itemValue" : "${origin_background_color}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 60)].itemValue" : "${origin_posting_title}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 61)].itemValue" : "${origin_posting_content}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 54)].itemValue" : "${origin_spacing_px}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 55)].itemValue" : "${origin_spacing_px}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 58)].itemValue" : "${origin_widget_font}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 113)].itemValue" : "${origin_widget_type}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 116)].itemValue" : "${widget_large}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 66)].itemValue" : "${origin_business_time_zone}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 73)].itemValue" : "${origin_chatwelcome_message}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 69)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 63)].itemValue" : "${origin_business_time}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 64)].itemValue" : "${origin_business_time}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 65)].itemValue" : "${origin_business_time}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 70)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 83)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 68)].itemValue" : "${enable}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 106)].itemValue" : "${visiable_all_time}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 107)].itemValue" : "${widget_show_all}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 108)].itemValue" : "${widget_show_all_page}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 109)].itemValue" : "${visiable_url}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 82)].itemValue" : "${order_track_day_30}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 74)].itemValue" : "${origin_waiting_time_message}"}
-    - eq: {"$.data.settingInfo[?(@.itemId == 168)].itemValue" : "${origin_waiting_time}"}
\ No newline at end of file
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 71)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 37)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 39)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 38)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 42)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 49)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 183)].itemValue" : "${random_avatar}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 56)].itemValue" : "${origin_greeting_word}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 57)].itemValue" : "${origin_team_introduction}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 59)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 52)].itemValue" : "${white_font}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 53)].itemValue" : "${widget_right}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 94)].itemValue" : "${origin_font_style}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 50)].itemValue" : "${origin_background_color}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 60)].itemValue" : "${origin_posting_title}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 61)].itemValue" : "${origin_posting_content}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 54)].itemValue" : "${origin_spacing_px}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 55)].itemValue" : "${origin_spacing_px}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 58)].itemValue" : "${origin_widget_font}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 113)].itemValue" : "${origin_widget_type}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 116)].itemValue" : "${widget_large}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 66)].itemValue" : "${origin_business_time_zone}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 73)].itemValue" : "${origin_chatwelcome_message}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 69)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 63)].itemValue" : "${origin_business_time}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 64)].itemValue" : "${origin_business_time}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 65)].itemValue" : "${origin_business_time}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 70)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 83)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 68)].itemValue" : "${enable}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 106)].itemValue" : "${visiable_all_time}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 107)].itemValue" : "${widget_show_all}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 108)].itemValue" : "${widget_show_all_page}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 109)].itemValue" : "${visiable_url}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 82)].itemValue" : "${order_track_day_30}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 74)].itemValue" : "${origin_waiting_time_message}"}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].settings[?(@.itemId == 168)].itemValue" : "${origin_waiting_time}"}
\ No newline at end of file