diff --git a/README.md b/README.md
index 356e5bc8..d4bbcd50 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
- 
+ 
diff --git a/README_CN.md b/README_CN.md
index ca1537dd..125af5d2 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -10,7 +10,7 @@
-
+
diff --git a/docker-compose.yml b/docker-compose.yml
index a1495fa2..f4e251da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3'
services:
sonic-server-eureka:
- image: "sonicorg/sonic-server-eureka:v1.3.0-release"
+ image: "sonicorg/sonic-server-eureka:v1.3.1-beta"
hostname: sonic-server-eureka
environment:
- EUREKA_HOST=sonic-server-eureka
@@ -12,7 +12,7 @@ services:
ports:
- "9090:9090"
sonic-server-bus:
- image: "sonicorg/sonic-server-bus:v1.3.0-release"
+ image: "sonicorg/sonic-server-bus:v1.3.1-beta"
environment:
- PROFILE=prod
- EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -24,7 +24,7 @@ services:
depends_on:
- sonic-server-eureka
sonic-server-gateway:
- image: "sonicorg/sonic-server-gateway:v1.3.0-release"
+ image: "sonicorg/sonic-server-gateway:v1.3.1-beta"
environment:
- PROFILE=prod
- EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -38,7 +38,7 @@ services:
ports:
- "8094:8094"
sonic-server-controller:
- image: "sonicorg/sonic-server-controller:v1.3.0-release"
+ image: "sonicorg/sonic-server-controller:v1.3.1-beta"
environment:
- PROFILE=prod
- EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -51,7 +51,7 @@ services:
- sonic-server-eureka
- sonic-server-gateway
sonic-server-folder:
- image: "sonicorg/sonic-server-folder:v1.3.0-release"
+ image: "sonicorg/sonic-server-folder:v1.3.1-beta"
environment:
- PROFILE=prod
- EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -68,7 +68,7 @@ services:
- sonic-server-eureka
- sonic-server-gateway
sonic-server-task:
- image: "sonicorg/sonic-server-task:v1.3.0-release"
+ image: "sonicorg/sonic-server-task:v1.3.1-beta"
environment:
- PROFILE=prod
- EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -81,7 +81,7 @@ services:
- sonic-server-eureka
- sonic-server-gateway
sonic-server-transport:
- image: "sonicorg/sonic-server-transport:v1.3.0-release"
+ image: "sonicorg/sonic-server-transport:v1.3.1-beta"
environment:
- PROFILE=prod
- EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
diff --git a/pom.xml b/pom.xml
index 802781b9..10f42cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
true
- sonicorg/${project.artifactId}:${project.version}
+ sonicorg/${project.artifactId}:v${project.version}
adoptopenjdk/openjdk15:alpine AS builder
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
diff --git a/sonic-server-bus/pom.xml b/sonic-server-bus/pom.xml
index 50a80987..6c570c69 100644
--- a/sonic-server-bus/pom.xml
+++ b/sonic-server-bus/pom.xml
@@ -10,7 +10,7 @@
4.0.0
sonic-server-bus
- v1.3.0-release
+ 1.3.1-beta
jar
diff --git a/sonic-server-controller/pom.xml b/sonic-server-controller/pom.xml
index 9bd415a0..284a9e4a 100644
--- a/sonic-server-controller/pom.xml
+++ b/sonic-server-controller/pom.xml
@@ -10,7 +10,7 @@
4.0.0
sonic-server-controller
- v1.3.0-release
+ 1.3.1-beta
jar
diff --git a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/ProjectsServiceImpl.java b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/ProjectsServiceImpl.java
index d0f80ba3..0ee25a1f 100644
--- a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/ProjectsServiceImpl.java
+++ b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/ProjectsServiceImpl.java
@@ -60,6 +60,7 @@ public void delete(int id) throws SonicException {
versionsService.deleteByProjectId(id);
baseMapper.deleteById(id);
} catch (Exception e) {
+ e.printStackTrace();
throw new SonicException("删除出错！请联系管理员！");
}
}
diff --git a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/PublicStepsServiceImpl.java b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/PublicStepsServiceImpl.java
index faf31e5a..7b719e97 100644
--- a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/PublicStepsServiceImpl.java
+++ b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/PublicStepsServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import java.util.*;
import java.util.stream.Collectors;
@@ -134,9 +135,14 @@ public PublicStepsDTO findById(int id) {
@Override
@Transactional(rollbackFor = Exception.class)
public boolean deleteByProjectId(int projectId) {
- PublicSteps publicSteps = lambdaQuery().eq(PublicSteps::getProjectId, projectId).one();
- publicStepsStepsMapper.delete(new LambdaQueryWrapper()
- .eq(PublicStepsSteps::getPublicStepsId, publicSteps.getId()));
- return delete(publicSteps.getId());
+ List publicSteps = lambdaQuery().eq(PublicSteps::getProjectId, projectId).list();
+ for (PublicSteps publicStep : publicSteps) {
+ if (!ObjectUtils.isEmpty(publicSteps)) {
+ publicStepsStepsMapper.delete(new LambdaQueryWrapper()
+ .eq(PublicStepsSteps::getPublicStepsId, publicStep.getId()));
+ delete(publicStep.getId());
+ }
+ }
+ return true;
}
}
diff --git a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java
index f723c2da..e1cdf028 100644
--- a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java
+++ b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java
@@ -130,6 +130,9 @@ public JSONObject findSteps(int id) {
@Override
public List findByIdIn(List ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return new ArrayList<>();
+ }
return listByIds(ids);
}
@@ -160,7 +163,7 @@ private JSONObject getStep(StepsDTO steps) {
@Override
public boolean deleteByProjectId(int projectId) {
- return baseMapper.delete(new LambdaQueryWrapper<>()) > 0;
+ return baseMapper.delete(new LambdaQueryWrapper().eq(TestCases::getProjectId, projectId)) > 0;
}
@Override
diff --git a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestSuitesServiceImpl.java b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestSuitesServiceImpl.java
index 02b4b610..8089617e 100644
--- a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestSuitesServiceImpl.java
+++ b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestSuitesServiceImpl.java
@@ -61,6 +61,11 @@ public RespModel runSuite(int suiteId, String strike) {
}
List devicesList = BeanTool.transformFromInBatch(testSuitesDTO.getDevices(), Devices.class);
+ for (int i = devicesList.size() - 1; i >= 0; i--) {
+ if (devicesList.get(i).getStatus().equals(DeviceStatus.OFFLINE) || devicesList.get(i).getStatus().equals(DeviceStatus.DISCONNECTED)) {
+ devicesList.remove(devicesList.get(i));
+ }
+ }
if (devicesList.size() == 0) {
return new RespModel<>(3003, "所选设备暂无可用！");
}
@@ -89,7 +94,7 @@ public RespModel runSuite(int suiteId, String strike) {
JSONObject gp = new JSONObject();
for (GlobalParams g : globalParamsList) {
if (g.getParamsValue().contains("|")) {
- List shuffle = Arrays.asList(g.getParamsValue().split("\\|"));
+ List shuffle = new ArrayList<>(Arrays.asList(g.getParamsValue().split("\\|")));
Collections.shuffle(shuffle);
valueMap.put(g.getParamsKey(), shuffle);
} else {
diff --git a/sonic-server-controller/src/main/resources/mapping/DevicesMapper.xml b/sonic-server-controller/src/main/resources/mapping/DevicesMapper.xml
index bb873d17..3e5fd7a1 100644
--- a/sonic-server-controller/src/main/resources/mapping/DevicesMapper.xml
+++ b/sonic-server-controller/src/main/resources/mapping/DevicesMapper.xml
@@ -43,7 +43,7 @@
- and d.agentId in
+ and d.agent_id in
#{agentId}
diff --git a/sonic-server-controller/src/main/resources/result.json b/sonic-server-controller/src/main/resources/result.json
index 4fa51dae..7839e1d9 100644
--- a/sonic-server-controller/src/main/resources/result.json
+++ b/sonic-server-controller/src/main/resources/result.json
@@ -64,6 +64,7 @@
"EVR-AL00": "HUAWEI Mate 20 X 全网通版",
"BL-W09": "HUAWEI MateBook E i3",
"HLYL-WFQ9": "荣耀 MagicBook Pro 2020 R5 (16GB+512GB)",
+ "HEGE-550AX": "华为智慧屏 B7-500",
"PDST00": "OPPO Reno5 Pro 移动版",
"CRR-TL00": "HUAWEI Mate S 移动臻享版",
"L75M6-5P": "小米电视 5 Pro 75 英寸",
@@ -125,12 +126,15 @@
"KLVC-WFH9L": "HUAWEI MateBook 14 (2020) i5 (16GB+512GB)",
"CPH2091": "OPPO Reno4",
"G7-TL00": "华为 Ascend G7 移动版",
+ "JAD-LX4": "HUAWEI P50 Pro",
+ "JAD-LX9": "HUAWEI P50 Pro",
"CPH2095": "OPPO A73",
"CPH2099": "OPPO A73",
"V1936A": "iQOO Neo 855 版 全网通版",
"M816H": "Meizu M8 Lite Global",
"ALP-AL00": "HUAWEI Mate 10 全网通版",
"BND-TL10": "荣耀畅玩 7X 移动 4G+ 版",
+ "V2168A": "vivo Y10 (t1 版) 全网通版",
"WRTB-WFE9L": "HUAWEI MateBook 13 (2020) i7 (16GB+512GB)",
"MDZ-09-AK": "小米盒子增强版 (GITV)",
"V1936T": "iQOO Neo 855 版 移动全网通版",
@@ -184,7 +188,7 @@
"CPH2065": "OPPO Reno4 Z",
"TAH-AN00m": "HUAWEI Mate Xs",
"ANA-TN00": "HUAWEI P40 5G 移动定制版",
- "DBY-W09": "HUAWEI MatePad 11 英寸 Wi-Fi 版",
+ "DBY-W09": "华为平板 C7 11 英寸 Wi-Fi 版",
"CPH2069": "OPPO A52",
"2014716": "Mi 4 LTE China Telecom",
"2014715": "Redmi Note 4G Global",
@@ -207,8 +211,10 @@
"CPH2037": "OPPO Reno3 Pro Global",
"CPH2036": "OPPO Reno3 Pro Global",
"V1934A": "vivo Y5s 全网通版",
+ "V2166A": "vivo Y33s 5G 全网通版",
"V1934T": "vivo Y5s 移动全网通版",
"M819H": "Meizu C9 Pro Global",
+ "G4S1M": "Pixel 5a 5G (Japan)",
"OXF-N29": "HONOR View30 PRO 5G Dual SIM",
"JKM-AL00": "华为畅享 9 Plus 全网通版",
"GT-I9507V": "Galaxy S4 联通 4G 定制版",
@@ -218,6 +224,7 @@
"L55M5-5S": "小米电视 4S 55 英寸 (2019)",
"M463U": "Meizu m1 note China Unicom",
"A101OP": "OPPO Reno5 A (SoftBank)",
+ "V2172A": "iQOO 9 Pro 5G 全网通版",
"L55M6-ESG": "Xiaomi TV Q1E 55",
"M463H": "Meizu m1 note Global",
"VTR-L09": "HUAWEI P10 Single SIM",
@@ -241,6 +248,7 @@
"V1941T": "vivo U3 移动全网通版",
"M1903C3ET": "Redmi 7A China Mobile",
"BMH-TN10": "荣耀 30 5G 移动定制版",
+ "G8VOU": "Pixel 6 Pro (US, AU) (mmWave)",
"HD65DESY": "华为智慧屏 SE 65 畅连通话版 1080P 金属底座 (2GB+16GB)",
"HD65DESZ": "华为智慧屏 SE 65 畅连通话版 1080P (2GB+16GB)",
"XT1799-1": "moto 青柚",
@@ -281,10 +289,12 @@
"M1804D2SG": "Mi A2 Global",
"M1804D2SI": "Mi A2 India",
"SM-T239C": "Galaxy Tab4 7.0 VE LTE",
+ "2112123AC": "Xiaomi 12X China",
"M2012K11G": "Mi 11i Global",
"M2012K11I": "Mi 11X Pro India",
"M792Q-L": "Meizu PRO 7 64GB China",
"M2012K11C": "Redmi K40 Pro China / Redmi K40 Pro+ China",
+ "2112123AG": "Xiaomi 12X Global",
"SM-A7000": "Galaxy A7 公开版",
"PDPT00": "OPPO Reno4 移动版",
"SM-G3502I": "Galaxy Trend 3 联通定制版",
@@ -293,6 +303,7 @@
"SM-G3502U": "Galaxy Trend 3 联通定制版",
"SM-P610": "Galaxy Tab S6 Lite WLAN",
"JSN-L42": "HONOR 8X Dual SIM",
+ "BZI-W00": "华为平板 C5e 10.1 英寸 Wi-Fi 版",
"PDKM00": "OPPO A92s 全网通版",
"M2012K10C": "Redmi K40 Gaming China",
"SM-G3502C": "Galaxy Trend 3 联通定制版",
@@ -310,6 +321,7 @@
"PCNT00": "OPPO K5 移动版",
"GT-N7100": "Galaxy Note2 公开版",
"GT-N7102": "Galaxy Note2 联通定制版",
+ "V2171A": "iQOO 9 5G 全网通版",
"ELS-TN10": "HUAWEI P40 Pro+ 5G 移动定制版",
"PCCT00": "OPPO Reno 10 倍变焦版 移动版",
"GT-N7108": "Galaxy Note2 移动定制版",
@@ -367,6 +379,7 @@
"PEMM00": "OPPO A55 全网通版",
"MLA-AL10": "HUAWEI 麦芒 5 全网通高配版",
"AKA-AL10": "荣耀 Play4T 全网通版",
+ "NbDE-WDH9": "HUAWEI MateBook D 14 SE i5",
"L55M5-AQ": "小米电视 4S 55 英寸 曲面",
"M1805E2A": "Mi 8 SE",
"M1805E2C": "小米 8 SE 联通电信定制版 (未上市)",
@@ -374,6 +387,7 @@
"SM-N7508V": "Galaxy Note3 Lite 移动定制版",
"M1902F1G": "Mi 9 Global",
"L55M5-AI": "Mi LED Smart TV 4 55",
+ "HD65KANY": "华为智慧屏 B5-610",
"L55M5-AN": "Mi LED Smart TV 4 Pro 55",
"M1902F1C": "Mi 9 China Unicom / China Telecom",
"IN2013": "OnePlus 8 EU / Global",
@@ -435,21 +449,29 @@
"NLR-WAQ9HNR": "荣耀 MagicBook 14 SE 2021 R5",
"RMX1943": "realme C2",
"M2004J7AC": "Redmi 10X 5G China",
+ "2201117TI": "Redmi Note 11 India",
"M2003J6A1R": "Redmi Note 9S Japan / Korea",
+ "2201117TG": "Redmi Note 11 Global",
"PLAT-760": "华为智慧屏 X65",
+ "2201117TL": "Redmi Note 11 Latin America",
"TNNH-AN00": "荣耀 Play4 5G 全网通版",
"JDN2-W09HN": "荣耀平板 5 8 英寸 Wi-Fi 版",
+ "2201117TY": "Redmi Note 11 Global (NFC)",
"XT1925-10": "moto 青柚 1s",
"SM-G3588V": "Galaxy Core Lite 4G 移动定制版",
"L55M5-EC": "小米全面屏电视 E55C",
"H60-L21": "荣耀 6 至尊版",
+ "2201117SG": "Redmi Note 11S Global",
"M1903C3GG": "Redmi Go Global",
"M1903C3GH": "Redmi Go Global",
"M1903C3GI": "Redmi Go India",
+ "2201117SL": "Redmi Note 11S Latin America",
"L55M5-EX": "小米全面屏电视 E55X",
+ "2201117SI": "Redmi Note 11S India",
"RMX1971": "realme 5 Pro",
"L55M5-ES": "小米全面屏电视 Pro E55S",
"7D-503LT": "荣耀 X1 移动 4G 版",
+ "2201117SY": "Redmi Note 11S Global (NFC)",
"LOK-350S": "荣耀智慧屏 X1 55 英寸 (4GB+32GB)",
"POT-LX3": "HUAWEI P smart 2019",
"POT-LX1": "HUAWEI P smart 2019",
@@ -470,6 +492,7 @@
"SKR-A0": "Black Shark China",
"AGS2-AL00": "华为畅享平板 10.1 英寸 全网通版",
"MDZ-18-AA": "小米盒子 3 增强版",
+ "L70M7-EA": "小米电视 EA70 2022 款",
"PBBM00": "OPPO A7x 全网通版",
"KKG-AN00": "荣耀 X10 Max 5G 全网通版",
"Boh-WAQ9RP": "HUAWEI MateBook D 15 R5 (16GB+256GB+1TB)",
@@ -554,15 +577,18 @@
"VLT-W50": "荣耀 MagicBook i5",
"PIC-LX9": "HUAWEI nova 2 Dual SIM",
"LLD-AL00": "荣耀 9 青春版 全网通版",
+ "MRG-W56": "HUAWEI MateBook X Pro (2022) i5",
"V1924A": "vivo NEX 3 5G 全网通版",
"HD85THAA": "华为智慧屏 V 85 2021 款",
"V2156A": "vivo Y76s 5G 全网通版",
"L32M6-6AEU": "Mi TV P1 32",
"PFJM10": "OPPO Reno7 全网通版",
+ "PESM10": "OPPO A36 全网通版",
"V1924T": "vivo NEX 3 5G 移动全网通版",
"V2023A": "iQOO U1 全网通版",
"LLD-AL10": "HONOR 9 Lite Dual SIM",
"PEMT00": "OPPO A55 移动版",
+ "PFUM10": "OPPO A96 全网通版",
"K520": "联想 S5",
"MAR-AL00": "HUAWEI nova 4e 全网通版",
"V2157A": "iQOO Neo5 SE 5G 全网通版",
@@ -571,6 +597,8 @@
"SM-G5109": "Galaxy Core Max 电信定制版",
"L50M5-5ARU": "Mi TV 4S 50",
"V2024A": "iQOO 5 5G 全网通版",
+ "MRG-W76": "HUAWEI MateBook X Pro (2022) i7",
+ "SP300": "NZONE S7 Pro+ 5G",
"TEL-AN00": "荣耀 X10 5G 全网通版",
"PEHM00": "OPPO A93 全网通版",
"V2158A": "vivo Y32 全网通版",
@@ -596,6 +624,7 @@
"MRD-LX1F": "HUAWEI Y6 2019 Dual SIM",
"L50M6-RA": "Redmi Smart TV X50",
"ATH-CL00": "荣耀 7i 电信版",
+ "MGI-AN00": "荣耀 Magic V 5G 全网通版",
"L55M2-AA": "小米电视 2 55 英寸",
"MRD-LX1N": "HUAWEI Y6 2019 Dual SIM",
"SM-G9508": "Galaxy S8 4G+",
@@ -619,6 +648,7 @@
"BKL-AL20": "荣耀 V10 全网通尊享版",
"HKD-W76": "HUAWEI MateBook 14s i7 (16GB+512GB/1TB)",
"V1922T": "iQOO Pro 移动全网通版",
+ "G-2PW2100": "Pixel XL (North America)",
"INE-TL00": "HUAWEI nova 3i 移动 4G+ 版",
"MI-ONE": "Mi 1 Lite",
"NOH-AL10": "HUAWEI Mate 40 Pro 4G 全网通版",
@@ -652,6 +682,7 @@
"BKL-AL10": "荣耀 V10 全网通高配版",
"JEF-AN00": "HUAWEI nova 7 5G 全网通版",
"SM-G9550": "Galaxy S8+",
+ "V2162A": "vivo S12 5G 全网通版",
"M1906F9SC": "Mi CC 9e China",
"V1930A": "vivo Y3 标准版 全网通版",
"8675A": "大神 F2 全网通版",
@@ -668,6 +699,7 @@
"BND-AL10": "HONOR 7X Dual SIM",
"SM-G1600": "Galaxy Folder",
"BND-AL00": "荣耀畅玩 7X 全网通版 (4GB+64GB)",
+ "V2163A": "vivo S12 Pro 5G 全网通版",
"T1-A23L": "荣耀畅玩平板 note LTE 版",
"JEF-AN20": "HUAWEI nova 7 5G 全网通版",
"M351": "Meizu MX3 16GB China Unicom",
@@ -726,6 +758,7 @@
"U9500": "华为 Ascend D1",
"SM-T970": "Galaxy Tab S7+ WLAN",
"DAV-713L": "华为 P8 Max",
+ "L50R8-X": "Redmi 智能电视 X50 2022 款",
"ATU-L23": "HUAWEI Y6 2018 Dual SIM",
"ATU-L22": "HUAWEI Y6 2018 Dual SIM",
"ATU-L21": "HUAWEI Y6 2018 Dual SIM",
@@ -734,6 +767,7 @@
"BMH-AN20": "荣耀 30 5G 全网通版",
"SM-A5160": "Galaxy A51 5G",
"S685H": "Meizu M3 Max Global",
+ "Hebe-BD00": "Hi nova 9 Pro 5G",
"S685M": "Meizu M3 Max China Mobile",
"S685C": "Meizu M3 Max China Telecom",
"SM-T735C": "Galaxy Tab S7 FE LTE",
@@ -741,6 +775,7 @@
"ATU-L42": "HUAWEI Y6 Prime 2018 Dual SIM",
"SKR-H0": "Black Shark Global",
"S685Q": "Meizu M3 Max China",
+ "BAL-AL00": "HUAWEI P50 Pocket 4G 全网通版",
"PCLM10": "OPPO Reno Ace 全网通版",
"KNT-AL10": "荣耀 V8 全网通版",
"SM-A5108": "Galaxy A5 (2016) 移动定制疾速版",
@@ -752,9 +787,11 @@
"Che2-TL00H": "荣耀畅玩 4X 移动渠道版 (2014)",
"PDNM00": "OPPO Reno4 Pro 全网通版",
"M2003J6B2G": "Redmi Note 9 Pro Global",
+ "MRR-W29": "HUAWEI MatePad Pro 10.8 英寸 (2021) Wi-Fi 版",
"SM-P583": "Galaxy Tab A (2016) with S Pen 10.1 WLAN",
"Che2-TL00M": "荣耀畅玩 4X 移动定制版 (2014)",
"SCM-W09": "华为平板 M6 10.8 英寸 Wi-Fi 版",
+ "BAL-AL10": "HUAWEI P50 Pocket 艺术定制版 4G 全网通版",
"21091116C": "Redmi Note 11 Pro China",
"KNT-AL20": "荣耀 V8 全网通版 (麒麟 955, 2K 显示屏)",
"21091116I": "Xiaomi 11i India",
@@ -764,6 +801,7 @@
"X800+": "乐 1 Pro 全网通版",
"21051182C": "Xiaomi Pad 5 China",
"ART-L29N": "HUAWEI Y7p Dual SIM",
+ "MRR-W39": "HUAWEI MatePad Pro 10.8 英寸 (2021) Wi-Fi 版",
"BMH-AN10": "荣耀 30 5G 全网通版",
"PDCM00": "OPPO Reno3 全网通版",
"PBDT00": "OPPO R17 Pro 移动版",
@@ -787,16 +825,17 @@
"Nbl-WAQ9HNRP": "荣耀 MagicBook 14 R5 (16GB+512GB)",
"NXT-AL10": "HUAWEI Mate 8 全网通版",
"VKY-L09": "HUAWEI P10 Plus Single SIM",
- "CPH2251": "OPPO Reno6",
+ "CPH2251": "OPPO Reno6 5G",
"WGR-W19": "HUAWEI MatePad Pro 12.6 英寸 Wi-Fi 版 (麒麟 9000)",
"A1567": "iPad Air 2 Wi-Fi + Cellular",
"A1566": "iPad Air 2 Wi-Fi",
- "CPH2249": "OPPO Reno6 Pro",
+ "CPH2249": "OPPO Reno6 Pro 5G",
"OWW202": "OPPO Watch 2 42mm 蓝牙版",
"A1553": "Apple Watch (1st generation, 38mm case)",
"WGR-W09": "HUAWEI MatePad Pro 12.6 英寸 Wi-Fi 版 (麒麟 9000E)",
"A1550": "iPad mini 4 Wi-Fi + Cellular",
"CPH2263": "OPPO A74 5G",
+ "CPH2269": "OPPO A16",
"A1554": "Apple Watch (1st generation, 42mm case)",
"BKL-L09": "HONOR View10 Dual SIM",
"MDG6S": "Redmi Note 5A Prime Global",
@@ -820,11 +859,14 @@
"CPH2235": "OPPO Reno6",
"C1": "Mi 1 CDMA",
"PLE-703LT": "华为揽阅 M2 青春版 7.0 英寸 双 4G 版",
+ "2201122G": "Xiaomi 12 Pro Global",
"A1593": "iPhone 6 Plus (China Mobile)",
"BZK-L00": "华为平板 C3 (华为平板 T3 行业专享版) 8 英寸 LTE 版",
+ "2201122C": "Xiaomi 12 Pro China",
"RVL-AL09": "荣耀 Note10 全网通版",
"PRA-AL00": "荣耀 8 青春版 全网通标配版",
"CAN-L13": "HUAWEI nova",
+ "G5NZ6": "Pixel 5 (Japan)",
"CAN-L12": "HUAWEI nova",
"V2106A": "iQOO U3x 5G 全网通版",
"LIO-N29": "PORSCHE DESIGN HUAWEI Mate 30 RS Dual SIM",
@@ -834,7 +876,7 @@
"FRD-WFG9": "荣耀猎人游戏本 V700 i5 (16GB+512GB)",
"V1801A0": "vivo Z1 全网通版",
"DRA-LX9": "HUAWEI Y5p Dual SIM",
- "CPH2247": "OPPO Reno6 Pro",
+ "CPH2247": "OPPO Reno6 Pro 5G",
"ART-TL00x": "华为畅享 10 移动 4G+ 版",
"DRA-LX5": "HONOR 7S Dual SIM",
"DRA-LX2": "HUAWEI Y5 Prime 2018 Dual SIM",
@@ -856,7 +898,7 @@
"SM-T825C": "Galaxy Tab S3 LTE",
"Nbl-WAE9HN": "荣耀 MagicBook 14 i7",
"A1522": "iPhone 6 Plus",
- "CPH2213": "OPPO F19 Pro+",
+ "CPH2213": "OPPO F19 Pro+ 5G",
"CPH2207": "OPPO Reno5 Pro 5G",
"MRX-AL09": "HUAWEI MatePad Pro 10.8 英寸 全网通版 (6GB+128GB/8GB+256GB)",
"CPH2205": "OPPO Reno5 Lite",
@@ -869,8 +911,10 @@
"H30-L01": "荣耀 3C 移动 4G 版",
"A1518": "iPhone 5s (China Mobile)",
"H30-L02": "荣耀 3C 联通 4G 版",
+ "G9S9B": "Pixel 6 (US, mmWave)",
"Boh-WAQ9HNL": "荣耀 MagicBook 15 科技尝鲜版 R5",
- "CPH2219": "OPPO F19",
+ "CPH2223": "OPPO F19s",
+ "CPH2219": "OPPO A74",
"CPH2217": "OPPO F19 Pro",
"HD55DESV": "华为智慧屏 SE 55 畅连通话版 4K (2GB+16GB)",
"HD55DESY": "华为智慧屏 SE 65 畅连通话版 1080P 金属底座 (2GB+16GB)",
@@ -929,6 +973,7 @@
"AC2001": "OnePlus Nord India",
"V1829T": "vivo X27 8GB+256GB 移动全网通版",
"SM-G8750": "Galaxy S 轻奢版",
+ "NAM-L09": "HUAWEI nova 9",
"L70M5-4A": "小米电视 4A 70 英寸",
"SM-A9080": "Galaxy A90 5G",
"HN55DNTA": "荣耀智慧屏 X2 55 英寸",
@@ -944,6 +989,7 @@
"SM-G6100": "Galaxy On7 (2016)",
"PLK-AL10": "荣耀 7 全网通高配版",
"1509-A00": "360 手机 Q5 Plus 全网通版",
+ "CPH2293": "OPPO Reno7 Pro 5G",
"L38021": "联想 K5 Play 移动版",
"L48M3-AR": "小米电视 2S 48 英寸",
"M8": "Meizu M8",
@@ -979,6 +1025,9 @@
"GT-I9118": "Galaxy Grand 移动定制版",
"L38041": "联想 K5 Pro",
"TAG-AL00": "华为畅享 5S 全网通版",
+ "HD55KANY": "华为智慧屏 B5-510",
+ "CPH2271": "OPPO A16",
+ "CPH2275": "OPPO A16",
"STF-AL10": "荣耀 9 全网通高配/尊享版",
"21061110AG": "POCO X3 GT Global",
"HD55KANS": "华为智慧屏 S Pro 55 120Hz (3GB+16GB)",
@@ -1032,6 +1081,8 @@
"A5010": "OnePlus 5T",
"MDT5": "Mi MIX 2 China Mobile",
"MDT6": "Redmi Note 5A China Mobile",
+ "G-2PW2200": "Pixel XL (Rest of the world)",
+ "RMX3491": "realme 9i",
"RMX2161": "realme Narzo 20 Pro",
"V1832A": "vivo S1 Pro 全网通版",
"V1965A": "vivo Y50 全网通版",
@@ -1041,6 +1092,7 @@
"L78121": "联想 Z6",
"MAT136": "Redmi 4X China Mobile",
"V1832T": "vivo S1 Pro 移动全网通版",
+ "GR1YH": "Pixel 6 Pro (Japan)",
"WRTD-WFE9": "HUAWEI MateBook 13 (2021) i7 (16GB+512GB)",
"MAR-LX1Am": "HUAWEI P30 lite",
"PDCT00": "OPPO Reno3 移动版",
@@ -1078,6 +1130,7 @@
"SNE-AL00": "HUAWEI 麦芒 7 全网通版",
"NblL-WFP9": "HUAWEI MateBook D 14 (2020) R7",
"CPH1823": "OPPO F9",
+ "F810": "雷鸟 FF1 5G",
"DLI-L22": "HONOR 6A Dual SIM",
"U9510E": "华为 Ascend D1 四核 XL",
"NEN-L22": "HUAWEI nova 8i",
@@ -1165,6 +1218,7 @@
"TRT-LX1": "HUAWEI Y7 2017 Dual SIM",
"TRT-LX2": "HUAWEI Y7 2017 Dual SIM",
"SM-N9100": "Galaxy Note4 公开版",
+ "21091116UG": "Redmi Note 11 Pro+ 5G Global",
"21091116UC": "Redmi Note 11 Pro+ China",
"NAM-AL00": "HUAWEI nova 9 4G 全网通版",
"V2020CA": "vivo S7 5G 全网通版",
@@ -1391,6 +1445,7 @@
"PIC-AL00": "HUAWEI nova 2 全网通版",
"TA-1392": "Nokia T20",
"M1807E8S": "Mi 8 Explorer Edition",
+ "G-2PW4100": "Pixel (North America)",
"V2047A": "vivo X60 Pro 5G 全网通版",
"CHM-U01": "HONOR 4C Dual SIM",
"SM-G8850": "Galaxy A9 Star 全网通版",
@@ -1410,6 +1465,7 @@
"CDY-NX9": "HUAWEI nova 7 SE 5G",
"V2048A": "vivo S9e 5G 全网通版",
"V1816T": "vivo X23 幻彩版 移动全网通版",
+ "SM-X200": "Galaxy Tab A8 WLAN",
"CPH2195": "OPPO A54 5G",
"BLA-L29": "PORSCHE DESIGN HUAWEI Mate 10 Dual SIM",
"L50M5-5A": "小米电视 4A 50 英寸 SE",
@@ -1514,6 +1570,7 @@
"SM-G9308": "Galaxy S7 移动定制版",
"Nbl-WAQ9HNR": "荣耀 MagicBook 14 / 14 SE R5",
"WLZ-AL10": "HUAWEI nova 6 4G 全网通版",
+ "M2110": "魅蓝 10",
"JAT-AL00": "荣耀畅玩 8A 全网通版",
"PAFM00": "OPPO Find X 标准版 全网通版",
"M571": "Meizu m2 note China",
@@ -1645,9 +1702,11 @@
"SM-A7100": "Galaxy A7 (2016) 全网通版",
"PCDT00": "OPPO A7n 移动版",
"1807-A01": "360 手机 N7",
+ "Hera-BD00": "Hi nova 9 5G",
"POT-AL00": "HUAWEI 麦芒 8 全网通版",
"DVC-AN00": "华为畅享 Z 5G 全网通版",
"PDAM10": "OPPO A52 全网通版",
+ "G6QU3": "Pixel 4a 5G (Verizon)",
"INE-LX1r": "HUAWEI nova 3i",
"PBBT30": "OPPO A5 移动版",
"Che1-CL20": "荣耀畅玩 4X 全网通版",
@@ -1659,6 +1718,7 @@
"POT-AL10": "HUAWEI 麦芒 8 全网通版",
"TAS-TN00": "HUAWEI Mate 30 5G 移动定制版",
"RMX1805": "realme C1",
+ "BAL-L49": "HUAWEI P50 Pocket",
"L78031": "联想 Z5 Pro",
"LDN-TL10": "华为畅享 8 移动 4G+ NFC 版",
"DVC-AN20": "华为畅享 20 Pro 5G 全网通版",
@@ -1670,8 +1730,10 @@
"L78051": "联想 Z6 Pro",
"8675-HD": "大神 F2 移动版",
"RMX1821": "realme 3",
+ "2201123G": "Xiaomi 12 Global",
"LDN-TL00": "华为畅享 8 移动 4G+ 标配版",
"RMX1825": "realme 3",
+ "2201123C": "Xiaomi 12 China",
"RMX1822": "realme 3",
"AMN-LX9": "HUAWEI Y5 2019 Dual SIM",
"MDZ-25-AA": "小米盒子 4S",
@@ -1724,7 +1786,6 @@
"L55M4-4XINA": "Mi LED Smart TV 4X Pro 55",
"BAC-L21": "HUAWEI nova 2 Plus Dual SIM",
"BAC-L22": "HUAWEI nova 2 Plus Dual SIM",
- "MRR-W29 MRR-W39": "HUAWEI MatePad Pro 10.8 英寸 (2021) Wi-Fi 版",
"CDY-TN90": "荣耀 30S 5G 移动定制版",
"1801-A01": "360 手机 N6 Pro",
"HYLR-WDQ9": "荣耀 MagicBook Pro 2020 R5 (16GB+512GB)",
@@ -1737,6 +1798,7 @@
"VNS-L21": "HUAWEI P9 lite",
"VNS-L23": "HUAWEI P9 lite",
"VNS-L22": "HUAWEI P9 lite",
+ "TYH612M": "麦芒 10 5G",
"EBG-TN00": "荣耀 30 Pro 5G 移动定制版",
"M721H": "Meizu M6 Note Global",
"M721C": "Meizu M6 Note China Telecom",
@@ -1745,6 +1807,7 @@
"MAR-LX1A": "HUAWEI P30 lite",
"MAR-LX1B": "HUAWEI P30 lite",
"SM-T590": "Galaxy Tab A (2018) 10.5 WLAN",
+ "TYH611M": "麦芒 10 SE 5G",
"VNS-L31": "HUAWEI P9 lite",
"M191Q": "MEIZU 18 Pro",
"DIG-TL10": "华为畅享 6S 移动 4G+ 版",
@@ -1832,14 +1895,17 @@
"M2006C3MI": "POCO C3 India",
"JMM-TL10": "荣耀 V9 Play 移动定制高配版",
"M2006C3MG": "Redmi 9C Global",
+ "RMX3300": "真我 GT2 Pro 5G",
"X608": "乐 1 移动定制版",
"PCEM00": "OPPO A9x 全网通版",
"LOK-360": "荣耀智慧屏 X1 65 英寸 (2GB+16GB)",
"CDY-TN20": "HUAWEI nova 7 SE 5G 移动全网通版",
+ "G-2PW4200": "Pixel (Rest of the world)",
"MRX-W19": "HUAWEI MatePad Pro 10.8 英寸 Wi-Fi 版 (8GB+256GB)",
"M2006C3LG": "Redmi 9A Global",
"M2006C3LI": "Redmi 9A / Redmi 9A Sport India",
"M2006C3LC": "Redmi 9A China",
+ "RMX3310": "真我 GT2 5G",
"PCPM00": "OPPO A91 全网通版",
"CPH1893RU": "OPPO AX7 Pro",
"2015628": "Mi 5 (64GB & 128GB) China",
@@ -1955,6 +2021,7 @@
"M686": "Meizu PRO 6 Plus 64GB China",
"L43M7-7AEU": "Xiaomi TV P1E 43",
"PECT30": "OPPO A53 (2020) 移动版",
+ "GTT9Q": "Pixel 5 (Rest of the world)",
"ATH-UL11": "ShotX",
"TAG-CL00": "华为畅享 5S 电信 4G 版",
"A2178": "iPod touch (7th generation)",
@@ -2135,6 +2202,7 @@
"LIO-AL00": "HUAWEI Mate 30 Pro 全网通版",
"SM-A3009": "Galaxy A3 电信定制版",
"SM-G9098": "领世旗舰",
+ "CPH2371": "OPPO Reno7 5G",
"M711H": "Meizu M6 Global",
"SM-G9092": "三星大器 3",
"CDY-AN00": "HUAWEI nova 7 SE 5G 全网通版",
@@ -2145,6 +2213,7 @@
"PCKM80": "OPPO Reno2 Z 全网通版",
"SM-A3000": "Galaxy A3 公开版",
"M181Q": "MEIZU 18",
+ "TYH601M": "麦芒 9 5G",
"8692-A00": "360 手机奇酷旗舰极客版",
"Y685Q": "Meizu M3s China",
"M712H": "Meizu M6s Global",
@@ -2169,6 +2238,7 @@
"CDY-AN20": "HUAWEI nova 7 SE 5G 全网通版",
"SM-J7108": "Galaxy J7 (2016) 移动定制版",
"NX569H": "nubia Z17 mini 高配版",
+ "CPH2349": "OPPO A16k",
"NX569J": "nubia Z17 mini 标准版",
"GRA-CL00": "华为 P8 电信标配版",
"L38111": "联想 Z6 青春版",
@@ -2182,7 +2252,9 @@
"AGS3-AL09HN": "荣耀平板 6 10.1 英寸 全网通版",
"DN2101": "OnePlus Nord 2 5G India",
"A2301": "iPad Pro (11-inch, 3rd generation) Wi-Fi + Cellular (16GB RAM, mmWave)",
+ "CPH2365": "OPPO A95",
"M710H": "Meizu M5c Global",
+ "SM-X205C": "Galaxy Tab A8 LTE",
"CUN-AL00": "荣耀畅玩 5 全网通版",
"VLR-W19": "荣耀 MagicBook 2019 i5",
"L75M6-ESG": "Mi TV Q1 75",
@@ -2193,6 +2265,7 @@
"A1889": "Apple Watch Series 3 (GPS + Cellular) (38mm case) (Europe and Asia Pacific)",
"A1890": "Apple Watch Series 3 (GPS + Cellular) (38mm case) (China mainland)",
"HDL-AL09": "荣耀 Waterplay 8 英寸 全网通版",
+ "SM-A125F": "Galaxy A12 Global",
"HRY-LX1MEB": "HONOR 10 Lite Dual SIM",
"MCE91": "Mi Pad 3",
"CRR-UL00": "HUAWEI Mate S Dual SIM",
@@ -2200,6 +2273,7 @@
"BoM-WFQ9": "HUAWEI MateBook D 15 (2021) R5",
"AGM3-AL09HN": "荣耀平板 7 10.1 英寸 全网通版",
"XT1085": "Moto X",
+ "SM-G9900": "Galaxy S21 FE 5G",
"一位或二位数字": "区分网络或地区版本，无明显规律",
"BLA-A09": "PORSCHE DESIGN HUAWEI Mate 10 (United States)",
"BAC-AL00": "HUAWEI nova 2 Plus 全网通版",
@@ -2222,6 +2296,7 @@
"A1892": "Apple Watch Series 3 (GPS + Cellular) (42mm case) (China mainland)",
"A1891": "Apple Watch Series 3 (GPS + Cellular) (42mm case) (Europe and Asia Pacific)",
"A1898": "iPhone 8 Plus (Japan)",
+ "CPH2325": "OPPO A55",
"A1897": "iPhone 8 Plus (GSM)",
"VTR-TL00": "HUAWEI P10 移动 4G+ 版",
"A1895": "iPad Pro (12.9-inch, 3rd generation) Wi-Fi + Cellular (1TB)",
@@ -2234,6 +2309,7 @@
"2013122": "Redmi Note TD-SCDMA (2GB RAM)",
"M2003J15SG": "Redmi Note 9 Global (NFC)",
"M2003J15SI": "Redmi Note 9 India",
+ "GD1YQ": "Pixel 5 (US)",
"M2003J15SS": "Redmi Note 9 Global",
"HEGE-560": "华为智慧屏 V65",
"M1806D9W": "Mi Pad 4 Wi-Fi",
@@ -2453,6 +2529,7 @@
"RMX2086": "realme X3 SuperZoom Global",
"V2072A": "vivo S9 5G 全网通版",
"RMX2085": "realme X3 SuperZoom India",
+ "C1502W": "Pixel C",
"M2103K19Y": "Redmi Note 10T Global",
"A2293": "Apple Watch Series 6 (GPS + Cellular) (40mm case) (North America)",
"CPH1921": "OPPO Reno 5G",
@@ -2500,6 +2577,8 @@
"T9510E": "华为 Ascend D1 四核 XL 移动版",
"SM-N9002": "Galaxy Note3 联通定制版",
"PRA-AL00X": "荣耀 8 青春版 全网通高配/顶配版",
+ "G013C": "Pixel 3 XL",
+ "G013A": "Pixel 3",
"SM-N9006": "Galaxy Note3 公开版",
"WRT-W29": "HUAWEI MateBook 13 i7",
"SM-N9009": "Galaxy Note3 电信定制版",
@@ -2519,7 +2598,9 @@
"WRT-W19": "HUAWEI MateBook 13 i5",
"L40M7-EA": "小米电视 EA40 2022 款",
"BE2028": "OnePlus Nord N10 T-Mobile",
+ "G011C": "Pixel 2 XL",
"BE2026": "OnePlus Nord N10 North America",
+ "G011A": "Pixel 2",
"BE2025": "OnePlus Nord N10 Metro",
"BE2029": "OnePlus Nord N10 Global",
"FIG-AL00": "华为畅享 7S 全网通标配版",
@@ -2540,6 +2621,7 @@
"A2270": "iPad (8th generation) Wi-Fi",
"A2275": "iPhone SE (2nd generation) (North America)",
"KRJ2-W09": "荣耀平板 V7 10.4 英寸 Wi-Fi 版",
+ "TET-AN10": "HUAWEI Mate X2 5G 全网通版",
"SM-T510": "Galaxy Tab A (2019) 10.1 WLAN",
"OW19W8": "OPPO Watch 46mm Wi-Fi",
"8012N": "中兴 Blade V2021 5G",
@@ -2561,6 +2643,7 @@
"A2220": "iPhone 11 Pro Max (China mainland, Hong Kong, Macao)",
"M1810F6LC": "Redmi 7 运营商全网通版 (未上市)",
"K320t": "联想 K320t",
+ "TET-AN00": "HUAWEI Mate X2 5G 全网通版",
"M851Q": "Meizu E3 China",
"TRT-AL00A": "华为畅享 7 Plus 全网通版",
"NX563J": "nubia Z17",
@@ -2610,6 +2693,7 @@
"A2410": "iPhone 12 Pro Max (Canada, Japan)",
"LE2117": "OnePlus 9 T-Mobile",
"EVA-DL00": "HUAWEI P9 双 4G 版",
+ "22011119UY": "Redmi 10 2022 Global (NFC)",
"LE2111": "OnePlus 9 India",
"NBR-WAH9": "荣耀 MagicBook X 14 i5",
"LE2113": "OnePlus 9 EU / Global",
@@ -2619,6 +2703,7 @@
"OE106": "坚果 Pro 2S",
"L40M5-AD": "小米电视 4A 40 英寸",
"JER-TN10": "HUAWEI nova 7 Pro 5G 移动全网通版",
+ "BZT3-W59": "华为平板 C5 10.4 英寸 2021 款 Wi-Fi 版",
"M2007J3SI": "Mi 10T Pro India",
"A2408": "iPhone 12 Pro (China mainland, Hong Kong, Macao)",
"A2407": "iPhone 12 Pro (Rest of the world)",
@@ -2657,6 +2742,7 @@
"GLK-LX1U": "HUAWEI nova 5i 联通定制版",
"K520t": "联想 S5 移动版",
"NX666J": "腾讯红魔游戏手机 6R",
+ "22011119TI": "Redmi 10 Prime 2022 India",
"SM-G7810": "Galaxy S20 FE 5G",
"PBAM00": "OPPO A5 全网通版",
"C2017": "中兴天机 7 MAX",
@@ -2672,6 +2758,7 @@
"M612M": "Meizu M5s China Mobile",
"NX667J": "nubia Z30 Pro",
"JER-TN20": "HUAWEI nova 7 Pro 5G 移动全网通版",
+ "BZT3-W69": "华为平板 C5 10.4 英寸 2021 款 Wi-Fi 版",
"8297D": "大神 F1 青春版",
"PEAT00": "OPPO Reno4 SE 移动版",
"PERM00": "OPPO K7x 全网通版",
@@ -2763,6 +2850,7 @@
"A1978": "Apple Watch Series 4 (GPS) (44mm case)",
"A1977": "Apple Watch Series 4 (GPS) (40mm case)",
"A1976": "Apple Watch Series 4 (GPS + Cellular) (44mm case) (North America)",
+ "GB7N6": "Pixel 6 (Rest of the world)",
"MDT6S": "Redmi Note 5A Prime China Mobile",
"GT-I9082C": "Galaxy Grand Neo+ 联通定制版",
"A1975": "Apple Watch Series 4 (GPS + Cellular) (40mm case) (North America)",
@@ -2773,6 +2861,7 @@
"V1916A": "iQOO Pro 5G 全网通版",
"AQM-LX1": "HUAWEI Y8p Dual SIM",
"JNY-AL10": "HUAWEI nova 6 SE 全网通版",
+ "21121119VL": "Redmi 10 2022 Latin America",
"LYA-L29": "PORSCHE DESIGN HUAWEI Mate 20 RS Dual SIM",
"PERM10": "OPPO K9s 全网通版",
"TA-1062": "Nokia 7 Plus",
@@ -2785,11 +2874,13 @@
"A1921": "iPhone XS Max (North America)",
"LYA-L0C": "HUAWEI Mate 20 Single SIM",
"LIO-TN00": "HUAWEI Mate 30 Pro 5G 移动定制版",
+ "V2140A": "vivo Y10 全网通版",
"GEM-703L": "荣耀 X2",
"A1920": "iPhone XS (North America)",
"BoB-WAE9P": "HUAWEI MateBook D 15 i7 (16GB+512GB)",
"MACH-W29": "HUAWEI MateBook X Pro i7",
"BLN-TL10": "荣耀畅玩 6X 移动定制版",
+ "2107113SI": "Xiaomi 11T Pro India",
"GT-I8190N": "Galaxy S3 Mini",
"2107113SG": "Xiaomi 11T Pro Global",
"2107113SR": "Xiaomi 11T Pro Japan",
@@ -2808,7 +2899,10 @@
"21121119SG": "Redmi 10 2022 Global",
"MT7-UL00": "华为 Ascend Mate 7 联通版",
"M926Q": "Meizu 16Xs China",
+ "VP001": "优畅享 20 Plus 5G",
"TA-1099": "Nokia X6",
+ "VP002": "优畅享 20 5G",
+ "VP003": "优畅享 30e 5G",
"TA-1094": "Nokia 9 PureView",
"HYLR-WFP9": "荣耀 MagicBook Pro 2020 R7 (16GB+512GB)",
"A1934": "iPad Pro (11-inch) Wi-Fi + Cellular (1TB)",
@@ -2816,7 +2910,7 @@
"M928Q": "Meizu 16T China",
"RMX3115": "真我 X7 Pro 至尊版 5G 全网通版",
"V1911A": "vivo Z5x 全网通版",
- "KOZ-AL40": "荣耀畅玩 20 全网通版",
+ "KOZ-AL40": "荣耀 Play5T 全网通版",
"L40M5-4A": "小米电视 4A 40 英寸 (未上市型号)",
"V2143A": "iQOO U3x 标准版 全网通版",
"L40M5-4C": "小米电视 4C 40 英寸 SE",
@@ -2864,8 +2958,12 @@
"M570M": "Meizu PRO 6 China Mobile",
"A1907": "iPhone 8 (China Mobile)",
"HRY-AL00": "HONOR 10 Lite Dual SIM",
+ "NE2213": "OnePlus 10 Pro EU / Global",
"M571U": "Meizu m2 note China Unicom",
+ "NE2215": "OnePlus 10 Pro North America",
"JSC-AN00": "HUAWEI nova 8 SE 5G 全网通版",
+ "NE2211": "OnePlus 10 Pro India",
+ "NE2210": "OnePlus 10 Pro China",
"RMX3031": "realme X7 Max",
"M571H": "Meizu m2 note Global",
"M571C": "Meizu m2 note China Telecom",
@@ -2877,6 +2975,7 @@
"TNA-AN00": "荣耀 60 Pro 5G 全网通版",
"L681M": "Meizu M3 note China Mobile",
"RMX3041": "真我 V13 5G 全网通版",
+ "SP200": "NZONE S7 Pro 5G",
"TIT-TL00": "华为畅享 5 移动 4G 版",
"BGO-DL09": "荣耀畅玩平板 LTE 版",
"L681Q": "Meizu M3 note China",
@@ -2932,12 +3031,18 @@
"M575H": "Meizu MX5 Global",
"M575U": "Meizu MX5 China Unicom",
"SM-A5070": "Galaxy A50s",
+ "G025N": "Pixel 4a (Rest of the world)",
+ "G025M": "Pixel 4a (Japan)",
+ "G025J": "Pixel 4a (North America, TW)",
"M032": "Meizu MX (Quad Core)",
+ "G025I": "Pixel 4a 5G (Rest of the world)",
"M031": "Meizu MX (Dual Core) (New)",
"L65M5-5SIN": "Mi TV 4X 65",
"PCKM00": "OPPO Reno2 全网通版",
+ "G025H": "Pixel 4a 5G (Japan)",
"M030": "Meizu MX (Dual Core)",
"RMX3085": "realme 8",
+ "G025E": "Pixel 4a 5G (North America, TW)",
"PBCT10": "OPPO R15x 移动版",
"RMX3081": "realme 8 Pro",
"A2378": "iPad Pro (12.9-inch, 5th generation) Wi-Fi (16GB RAM)",
@@ -2962,6 +3067,7 @@
"SM-C9000": "Galaxy C9 Pro 全网通版",
"KLE-A0": "Black Shark 3S China",
"8692-M02": "360 手机奇酷旗舰版 双网通版",
+ "G1F8F": "Pixel 5a 5G (US)",
"PCET00": "OPPO A9x 移动版",
"SM-C9008": "Galaxy C9 Pro 4G+",
"PE-TL10": "HONOR 6 Plus Dual SIM",
@@ -3012,9 +3118,23 @@
"NOP-AN00": "HUAWEI Mate 40 RS 保时捷设计",
"M621M": "Meizu M5 Note China Mobile",
"A2341": "iPhone 12 Pro (United States)",
+ "G020Q": "Pixel 4 XL (Japan)",
+ "G020P": "Pixel 4 XL (Rest of the world)",
"M621H": "Meizu M5 Note Global",
"SM-G3518": "Galaxy Core",
+ "G020N": "Pixel 4 (Japan)",
+ "G020M": "Pixel 4 (Rest of the world)",
+ "G020J": "Pixel 4 XL (North America, TW)",
+ "G020I": "Pixel 4 (North America, TW)",
+ "G020H": "Pixel 3a (Japan)",
+ "G020G": "Pixel 3a (North America)",
"M621Q": "Meizu M5 Note China",
+ "G020F": "Pixel 3a (UK, Europe, and APAC)",
+ "G020E": "Pixel 3a (Verizon)",
+ "G020D": "Pixel 3a XL (Japan)",
+ "G020C": "Pixel 3a XL (North America)",
+ "G020B": "Pixel 3a XL (UK, Europe, and APAC)",
+ "G020A": "Pixel 3a XL (Verizon)",
"SCMR-AL09": "HUAWEI MatePad 10.8 英寸 全网通版",
"POT-TL00a": "华为畅享 9S 移动 4G+ 版",
"A2322": "中兴 Axon 30 5G",
@@ -3244,6 +3364,7 @@
"M1908C3II": "Redmi 8 India",
"A0722": "中兴 Blade A4",
"M1908C3IH": "Redmi 8 Global",
+ "GLUOG": "Pixel 6 Pro (Rest of the world)",
"M1908C3IG": "Redmi 8 Global",
"M1908C3IE": "Redmi 8 China",
"M1908C3IC": "Redmi 8 Chinese Carrier Version",
@@ -3259,6 +3380,7 @@
"SM-G7108": "Galaxy Grand 2 移动定制版",
"MYA-AL10": "荣耀畅玩 6 全网通版",
"RMX3125": "真我 V11s 5G 全网通版",
+ "PGCM10": "OPPO K9x 全网通版",
"ALE-TL00": "华为 P8 青春版 移动版",
"RMX3121": "真我 V11 5G 全网通版",
"RMX3122": "真我 V11 5G 运营商定制版",
@@ -3267,7 +3389,6 @@
"V2099A": "vivo Y30 2021 全网通版",
"L40M5-RA": "Redmi 红米电视 40 英寸 R40A",
"AQM-AL00": "华为畅享 10S 全网通版",
- "TET-AN00 TET-AN10": "HUAWEI Mate X2 5G 全网通版",
"MBT6A5": "Redmi Note 4X (Mediatek) China Mobile",
"2016090": "Redmi 4",
"AQM-AL10": "荣耀 Play4T Pro 全网通版",
@@ -3306,6 +3427,7 @@
"RTE-AL00": "HUAWEI nova 9 Pro 4G 全网通版",
"TA-1000": "Nokia 6",
"SM-C101": "Galaxy S4 zoom",
+ "SP100": "NZONE S7 5G",
"PCKT80": "OPPO Reno2 Z 移动版",
"2016089": "Mi 5c",
"BLN-AL40": "荣耀畅玩 6X 全网通版 (电信 800M)",
@@ -3320,7 +3442,7 @@
"SCH-I679": "Galaxy Ace 3 电信定制版",
"MT2110": "OnePlus 9RT China",
"M1903F11A": "Redmi K20 Pro Premium Edition China",
- "MT2111": "OnePlus RT India",
+ "MT2111": "OnePlus 9RT India",
"VCE-AL00": "HUAWEI nova 4 全网通版",
"P2-0000": "华为 Ascend P2",
"M1903F11C": "Redmi K20 Pro Chinese Carrier Version",
@@ -3398,7 +3520,9 @@
"STK-L22": "HUAWEI Y9s Dual SIM",
"2016036": "Redmi 3X",
"PAK-AL09": "HUAWEI MateBook E (2019)",
+ "2201116TI": "Redmi Note 11 Pro India",
"SPN-AL00": "HUAWEI nova 5z 全网通版",
+ "2201116TG": "Redmi Note 11 Pro Global",
"L40M5-FA": "小米全面屏电视 E40A",
"A680Q": "Meizu M1 E China",
"A2459": "iPad Pro (11-inch, 3rd generation) Wi-Fi + Cellular (16GB RAM)",
@@ -3409,7 +3533,10 @@
"A2460": "iPad Pro (11-inch, 3rd generation) Wi-Fi + Cellular (16GB RAM, China mainland)",
"L60M5-AA": "小米电视 3s 60 英寸",
"PLE-703L": "华为揽阅 M2 青春版 7.0 英寸 全网通版",
+ "2201116SI": "Redmi Note 11 Pro 5G India",
+ "2201116SG": "Redmi Note 11 Pro 5G Global",
"V1938CT": "vivo X30 5G 移动全网通版",
+ "HEGE-550X": "华为智慧屏 B7-510",
"HN-W19R": "HUAWEI MateBook 13 锐龙版",
"HN-W19L": "HUAWEI MateBook 13 锐龙 Linux 版",
"M611H": "Meizu M5 Global",
@@ -3422,6 +3549,7 @@
"A680H": "Meizu M3E Global",
"HEGE-550B": "华为智慧屏 V55i-B (4GB+32GB)",
"Hol-U10": "荣耀 3C 畅玩版 联通版",
+ "2201116SR": "Redmi Note 11 Pro 5G Japan",
"V1990A": "vivo Z5x 712 版 全网通版",
"2016002": "Mi Max Global",
"2016001": "Mi Max China",
diff --git a/sonic-server-eureka/pom.xml b/sonic-server-eureka/pom.xml
index 66e0c6a6..523a9a66 100644
--- a/sonic-server-eureka/pom.xml
+++ b/sonic-server-eureka/pom.xml
@@ -10,7 +10,7 @@
4.0.0
sonic-server-eureka
- v1.3.0-release
+ 1.3.1-beta
jar
diff --git a/sonic-server-folder/pom.xml b/sonic-server-folder/pom.xml
index 9d914620..bd26c352 100644
--- a/sonic-server-folder/pom.xml
+++ b/sonic-server-folder/pom.xml
@@ -10,7 +10,7 @@
4.0.0
sonic-server-folder
- v1.3.0-release
+ 1.3.1-beta
jar
diff --git a/sonic-server-gateway/pom.xml b/sonic-server-gateway/pom.xml
index 9fa9c29b..2992a8af 100644
--- a/sonic-server-gateway/pom.xml
+++ b/sonic-server-gateway/pom.xml
@@ -10,7 +10,7 @@
4.0.0
sonic-server-gateway
- v1.3.0-release
+ 1.3.1-beta
jar
diff --git a/sonic-server-task/pom.xml b/sonic-server-task/pom.xml
index 03f401f5..fa81f8c6 100644
--- a/sonic-server-task/pom.xml
+++ b/sonic-server-task/pom.xml
@@ -10,7 +10,7 @@
4.0.0
sonic-server-task
- v1.3.0-release
+ 1.3.1-beta
jar
diff --git a/sonic-server-transport/pom.xml b/sonic-server-transport/pom.xml
index 7fd08f42..aaf6304d 100644
--- a/sonic-server-transport/pom.xml
+++ b/sonic-server-transport/pom.xml
@@ -10,7 +10,7 @@
4.0.0
sonic-server-transport
- v1.3.0-release
+ 1.3.1-beta
jar
diff --git a/sonic-server-transport/src/main/java/org/cloud/sonic/transport/netty/NettyServerHandler.java b/sonic-server-transport/src/main/java/org/cloud/sonic/transport/netty/NettyServerHandler.java
index 64e9ecaf..03c94a2f 100644
--- a/sonic-server-transport/src/main/java/org/cloud/sonic/transport/netty/NettyServerHandler.java
+++ b/sonic-server-transport/src/main/java/org/cloud/sonic/transport/netty/NettyServerHandler.java
@@ -69,22 +69,32 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
controllerFeignClient.saveResultDetail(jsonMsg);
break;
case "findSteps":
- LinkedHashMap j = (LinkedHashMap) controllerFeignClient.findSteps(jsonMsg.getInteger("caseId")).getData();
- if (j != null) {
- JSONObject steps = new JSONObject();
- steps.put("msg", "runStep");
- steps.put("pf", j.get("pf"));
- steps.put("steps", j.get("steps"));
- steps.put("gp", j.get("gp"));
- steps.put("sessionId", jsonMsg.getString("sessionId"));
- steps.put("pwd", jsonMsg.getString("pwd"));
- steps.put("udId", jsonMsg.getString("udId"));
- NettyServer.getMap().get(jsonMsg.getInteger("agentId")).writeAndFlush(steps.toJSONString());
- }
+ JSONObject steps = findSteps(jsonMsg, "runStep");
+ NettyServer.getMap().get(jsonMsg.getInteger("agentId")).writeAndFlush(steps.toJSONString());
break;
}
}
+ /**
+ * 查找 & 封装步骤对象
+ *
+ * @param jsonMsg websocket消息
+ * @return 步骤对象
+ */
+ private JSONObject findSteps(JSONObject jsonMsg, String msg) {
+ LinkedHashMap j = (LinkedHashMap) controllerFeignClient.findSteps(jsonMsg.getInteger("caseId")).getData();
+ JSONObject steps = new JSONObject();
+ steps.put("cid", jsonMsg.getInteger("caseId"));
+ steps.put("msg", msg);
+ steps.put("pf", j.get("pf"));
+ steps.put("steps", j.get("steps"));
+ steps.put("gp", j.get("gp"));
+ steps.put("sessionId", jsonMsg.getString("sessionId"));
+ steps.put("pwd", jsonMsg.getString("pwd"));
+ steps.put("udId", jsonMsg.getString("udId"));
+ return steps;
+ }
+
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
logger.info("Agent: {} 发生异常 {}", ctx.channel().remoteAddress(), cause.fillInStackTrace());