diff --git a/api/device-define/car.json b/api/device-define/car.json
index 05103c40dc4ab7692b280cfc3c3215c5195c7df6..986005a68f4cb2be5e1ff555e45301076ba5e8b8 100644
--- a/api/device-define/car.json
+++ b/api/device-define/car.json
@@ -24,11 +24,11 @@
     "SystemCapability.Communication.NetStack",
     "SystemCapability.Communication.WiFi.Core",
     "SystemCapability.Communication.WiFi.STA",
-    "SystemCapability.Communication.WiFi.AP",
+    "SystemCapability.Communication.WiFi.AP.Core",
     "SystemCapability.Communication.WiFi.P2P",
     "SystemCapability.Communication.Bluetooth.Core",
     "SystemCapability.Communication.Bluetooth.Lite",
-    "SystemCapability.Location.Location.Base",
+    "SystemCapability.Location.Location.Core",
     "SystemCapability.Location.Location.Geocoder",
     "SystemCapability.Location.Location.Geofence",
     "SystemCapability.Location.Location.Gnss",
@@ -119,6 +119,9 @@
     "SystemCapability.Ability.AbilityRuntime.Mission",
     "SystemCapability.Ability.AbilityTools.AbilityAssistant",
     "SystemCapability.Ability.Form",
-    "SystemCapability.Applications.ContactsData"
+    "SystemCapability.Applications.ContactsData",
+    "SystemCapability.Applications.Contacts",
+    "SystemCapability.Applications.settings.Core",
+    "SystemCapability.Test.UiTest"
   ]
 }
\ No newline at end of file
diff --git a/api/device-define/pc.json b/api/device-define/pc.json
index b246c5b4f5cc05943c7e256bc722a70b790594f6..3da8891b9998525eb69935e5bd7ed601981e6d6a 100644
--- a/api/device-define/pc.json
+++ b/api/device-define/pc.json
@@ -24,7 +24,7 @@
     "SystemCapability.Communication.NetStack",
     "SystemCapability.Communication.WiFi.Core",
     "SystemCapability.Communication.WiFi.STA",
-    "SystemCapability.Communication.WiFi.AP",
+    "SystemCapability.Communication.WiFi.AP.Core",
     "SystemCapability.Communication.WiFi.P2P",
     "SystemCapability.Communication.Bluetooth.Core",
     "SystemCapability.Communication.Bluetooth.Lite",
@@ -104,9 +104,7 @@
     "SystemCapability.Account.OsAccount",
     "SystemCapability.Account.AppAccount",
     "SystemCapability.UserIAM.UserAuth.Core",
-    "SystemCapability.UserIAM.AuthExecutorManager",
     "SystemCapability.UserIAM.UserAuth.PinAuth",
-    "SystemCapability.UserIAM.UserIdm",
     "SystemCapability.UserIAM.UserAuth.FaceAuth",
     "SystemCapability.Miscservices.InputMethodFramework",
     "SystemCapability.Miscservices.Pasteboard",
@@ -142,6 +140,8 @@
     "SystemCapability.Ability.AbilityRuntime.Mission",
     "SystemCapability.Ability.AbilityTools.AbilityAssistant",
     "SystemCapability.Ability.Form",
-    "SystemCapability.Applications.ContactsData"
+    "SystemCapability.Applications.ContactsData",
+    "SystemCapability.Applications.Contacts",
+    "SystemCapability.Applications.settings.Core"
   ]
 }
\ No newline at end of file
diff --git a/api/device-define/phone.json b/api/device-define/phone.json
index 110656a6739ec825ee34a2a7ddeaad75532548ed..3e980522a5c287bf4b66f13378157e156de8d878 100644
--- a/api/device-define/phone.json
+++ b/api/device-define/phone.json
@@ -24,11 +24,11 @@
     "SystemCapability.Communication.NetStack",
     "SystemCapability.Communication.WiFi.Core",
     "SystemCapability.Communication.WiFi.STA",
-    "SystemCapability.Communication.WiFi.AP",
+    "SystemCapability.Communication.WiFi.AP.Core",
     "SystemCapability.Communication.WiFi.P2P",
     "SystemCapability.Communication.Bluetooth.Core",
     "SystemCapability.Communication.Bluetooth.Lite",
-    "SystemCapability.Location.Location.Base",
+    "SystemCapability.Location.Location.Core",
     "SystemCapability.Location.Location.Geocoder",
     "SystemCapability.Location.Location.Geofence",
     "SystemCapability.Location.Location.Gnss",
@@ -109,9 +109,7 @@
     "SystemCapability.Account.OsAccount",
     "SystemCapability.Account.AppAccount",
     "SystemCapability.UserIAM.UserAuth.Core",
-    "SystemCapability.UserIAM.AuthExecutorManager",
     "SystemCapability.UserIAM.UserAuth.PinAuth",
-    "SystemCapability.UserIAM.UserIdm",
     "SystemCapability.UserIAM.UserAuth.FaceAuth",
     "SystemCapability.Miscservices.InputMethodFramework",
     "SystemCapability.Miscservices.Pasteboard",
@@ -150,6 +148,8 @@
     "SystemCapability.Ability.AbilityTools.AbilityAssistant",
     "SystemCapability.Ability.Form",
     "SystemCapability.Applications.ContactsData",
+    "SystemCapability.Applications.Contacts",
+    "SystemCapability.Applications.settings.Core",
     "SystemCapability.Test.UiTest"
   ]
 }
diff --git a/api/device-define/router.json b/api/device-define/router.json
index 85e9112487a620cb9aad42e56f9895ecf5eaa021..c06caa45a6577ada6f7543eb66df0f3eacd42ad0 100644
--- a/api/device-define/router.json
+++ b/api/device-define/router.json
@@ -1,6 +1,7 @@
 {
   "SysCaps": [
     "SystemCapability.Communication.SoftBus.Core",
+    "SystemCapability.Communication.WiFi.AP.Extension",
     "SystemCapability.PowerManager.PowerManager.Lite",
     "SystemCapability.PowerManager.BatteryManager.Lite",
     "SystemCapability.Customization.ConfigPolicy",
diff --git a/api/device-define/smartVision.json b/api/device-define/smartVision.json
index ff3cfe487d09892f85d4e9a67f3cd7de633c4926..a569e71df999cef661f9380a931fbf783976d6ca 100644
--- a/api/device-define/smartVision.json
+++ b/api/device-define/smartVision.json
@@ -10,6 +10,7 @@
     "SystemCapability.HiviewDFX.HiLogLite",
     "SystemCapability.HiviewDFX.HiviewLite",
     "SystemCapability.Update.UpdateService",
+    "SystemCapability.Security.Cipher",
     "SystemCapability.FileManagement.File.FileIO",
     "SystemCapability.FileManagement.File.Environment",
     "SystemCapability.Startup.SystemInfo"
diff --git a/api/device-define/tablet.json b/api/device-define/tablet.json
index 852313a6af73487fa745ccc41ee573fc2ab3e419..eb35fabc712533053ee919ec3df51ffd4887d30d 100644
--- a/api/device-define/tablet.json
+++ b/api/device-define/tablet.json
@@ -24,11 +24,11 @@
     "SystemCapability.Communication.NetStack",
     "SystemCapability.Communication.WiFi.Core",
     "SystemCapability.Communication.WiFi.STA",
-    "SystemCapability.Communication.WiFi.AP",
+    "SystemCapability.Communication.WiFi.AP.Core",
     "SystemCapability.Communication.WiFi.P2P",
     "SystemCapability.Communication.Bluetooth.Core",
     "SystemCapability.Communication.Bluetooth.Lite",
-    "SystemCapability.Location.Location.Base",
+    "SystemCapability.Location.Location.Core",
     "SystemCapability.Location.Location.Geocoder",
     "SystemCapability.Location.Location.Geofence",
     "SystemCapability.Location.Location.Gnss",
@@ -109,9 +109,7 @@
     "SystemCapability.Account.OsAccount",
     "SystemCapability.Account.AppAccount",
     "SystemCapability.UserIAM.UserAuth.Core",
-    "SystemCapability.UserIAM.AuthExecutorManager",
     "SystemCapability.UserIAM.UserAuth.PinAuth",
-    "SystemCapability.UserIAM.UserIdm",
     "SystemCapability.UserIAM.UserAuth.FaceAuth",
     "SystemCapability.Miscservices.InputMethodFramework",
     "SystemCapability.Miscservices.Pasteboard",
@@ -149,6 +147,9 @@
     "SystemCapability.Ability.AbilityRuntime.Mission",
     "SystemCapability.Ability.AbilityTools.AbilityAssistant",
     "SystemCapability.Ability.Form",
-    "SystemCapability.Applications.ContactsData"
+    "SystemCapability.Applications.ContactsData",
+    "SystemCapability.Applications.Contacts",
+    "SystemCapability.Applications.settings.Core",
+    "SystemCapability.Test.UiTest"
   ]
 }
\ No newline at end of file
diff --git a/api/device-define/tv.json b/api/device-define/tv.json
index 107cc2a160036dfc926a1a09e30344050057e498..69a879c2ceff6796737aa286602af8cc81a783ea 100644
--- a/api/device-define/tv.json
+++ b/api/device-define/tv.json
@@ -24,7 +24,7 @@
     "SystemCapability.Communication.NetStack",
     "SystemCapability.Communication.WiFi.Core",
     "SystemCapability.Communication.WiFi.STA",
-    "SystemCapability.Communication.WiFi.AP",
+    "SystemCapability.Communication.WiFi.AP.Core",
     "SystemCapability.Communication.WiFi.P2P",
     "SystemCapability.Communication.Bluetooth.Core",
     "SystemCapability.Communication.Bluetooth.Lite",
@@ -95,9 +95,7 @@
     "SystemCapability.Account.OsAccount",
     "SystemCapability.Account.AppAccount",
     "SystemCapability.UserIAM.UserAuth.Core",
-    "SystemCapability.UserIAM.AuthExecutorManager",
     "SystemCapability.UserIAM.UserAuth.PinAuth",
-    "SystemCapability.UserIAM.UserIdm",
     "SystemCapability.UserIAM.UserAuth.FaceAuth",
     "SystemCapability.Miscservices.Time",
     "SystemCapability.FileManagement.StorageService.Backup",
@@ -126,6 +124,7 @@
     "SystemCapability.Ability.AbilityRuntime.AbilityCore",
     "SystemCapability.Ability.AbilityRuntime.Mission",
     "SystemCapability.Ability.AbilityTools.AbilityAssistant",
-    "SystemCapability.Ability.Form"
+    "SystemCapability.Ability.Form",
+    "SystemCapability.Applications.settings.Core"
   ]
 }
\ No newline at end of file
diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json
index 29faba1ca7b7b9875435c924afb5e71ec1acdbd7..c2c27a542f5c21433a72cfead9e8182b26f51ffe 100644
--- a/api/device-define/wearable.json
+++ b/api/device-define/wearable.json
@@ -22,11 +22,11 @@
     "SystemCapability.Communication.NetStack",
     "SystemCapability.Communication.WiFi.Core",
     "SystemCapability.Communication.WiFi.STA",
-    "SystemCapability.Communication.WiFi.AP",
+    "SystemCapability.Communication.WiFi.AP.Core",
     "SystemCapability.Communication.WiFi.P2P",
     "SystemCapability.Communication.Bluetooth.Core",
     "SystemCapability.Communication.Bluetooth.Lite",
-    "SystemCapability.Location.Location.Base",
+    "SystemCapability.Location.Location.Core",
     "SystemCapability.Location.Location.Geocoder",
     "SystemCapability.Location.Location.Geofence",
     "SystemCapability.Location.Location.Gnss",
@@ -100,9 +100,7 @@
     "SystemCapability.Account.OsAccount",
     "SystemCapability.Account.AppAccount",
     "SystemCapability.UserIAM.UserAuth.Core",
-    "SystemCapability.UserIAM.AuthExecutorManager",
     "SystemCapability.UserIAM.UserAuth.PinAuth",
-    "SystemCapability.UserIAM.UserIdm",
     "SystemCapability.UserIAM.UserAuth.FaceAuth",
     "SystemCapability.Miscservices.Time",
     "SystemCapability.FileManagement.StorageService.SpatialStatistics",
@@ -127,6 +125,8 @@
     "SystemCapability.Ability.AbilityRuntime.Mission",
     "SystemCapability.Ability.AbilityTools.AbilityAssistant",
     "SystemCapability.Ability.Form",
-    "SystemCapability.Applications.ContactsData"
+    "SystemCapability.Applications.ContactsData",
+    "SystemCapability.Applications.Contacts",
+    "SystemCapability.Applications.settings.Core"
   ]
 }
\ No newline at end of file
diff --git a/api/syscapCheck/sysCapSchema.json b/api/syscapCheck/sysCapSchema.json
index 586d6b250a500ea7a41d7a02365b7ce408973042..2060ea3812811af3b0790135e396213b80fe9878 100644
--- a/api/syscapCheck/sysCapSchema.json
+++ b/api/syscapCheck/sysCapSchema.json
@@ -54,7 +54,7 @@
                 "type": "array",
                 "items": {
                   "type": "string",
-                  "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$"
+                  "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$"
                 }
               }
             }
@@ -75,7 +75,7 @@
           "type": "array",
           "items": {
             "type": "string",
-            "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$"
+            "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$"
           }
         }
       }
@@ -94,14 +94,14 @@
           "type": "array",
           "items": {
             "type": "string",
-            "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$"
+            "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$"
           }
         },
         "removedSysCaps": {
           "type": "array",
           "items": {
             "type": "string",
-            "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$"
+            "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$"
           }
         }
       }