Commit 7a23bc0a419472a27f32dbc93d70853a60044fc1
Merge branch 'ft' into 'main'
fix:设备配置lmw2m取消服务器私钥 See merge request huang/yun-teng-iot-front!180
Showing
1 changed file
with
2 additions
and
10 deletions
| @@ -148,11 +148,7 @@ | @@ -148,11 +148,7 @@ | ||
| 148 | port1: allEchoObj?.bootstrap?.lwm2mServer?.port, | 148 | port1: allEchoObj?.bootstrap?.lwm2mServer?.port, |
| 149 | serverId1: allEchoObj?.bootstrap?.lwm2mServer?.serverId, | 149 | serverId1: allEchoObj?.bootstrap?.lwm2mServer?.serverId, |
| 150 | securityMode1: allEchoObj?.bootstrap?.lwm2mServer?.securityMode, | 150 | securityMode1: allEchoObj?.bootstrap?.lwm2mServer?.securityMode, |
| 151 | - serverPublicKey1: | ||
| 152 | - allEchoObj?.bootstrap?.lwm2mServer?.serverPublicKey == null | ||
| 153 | - ? `3059301306072a8648ce3d020106082a8648ce3d03010703420004e353af009b814ee2f9ab393a975e0c | ||
| 154 | - 39e2fff60e3603fd6ee54a43b89a4f56258a7aa9c7e4a577760edb289dc955d91968473ee8a1bfc2b9c423563796113009` | ||
| 155 | - : allEchoObj?.bootstrap?.lwm2mServer?.serverPublicKey, | 151 | + serverPublicKey1: allEchoObj?.bootstrap?.lwm2mServer?.serverPublicKey, |
| 156 | clientHoldOffTime1: allEchoObj?.bootstrap?.lwm2mServer?.clientHoldOffTime, | 152 | clientHoldOffTime1: allEchoObj?.bootstrap?.lwm2mServer?.clientHoldOffTime, |
| 157 | bootstrapServerAccountTimeout1: | 153 | bootstrapServerAccountTimeout1: |
| 158 | allEchoObj?.bootstrap?.lwm2mServer?.bootstrapServerAccountTimeout, | 154 | allEchoObj?.bootstrap?.lwm2mServer?.bootstrapServerAccountTimeout, |
| @@ -162,11 +158,7 @@ | @@ -162,11 +158,7 @@ | ||
| 162 | port: allEchoObj?.bootstrap?.bootstrapServer?.port, | 158 | port: allEchoObj?.bootstrap?.bootstrapServer?.port, |
| 163 | serverId: allEchoObj?.bootstrap?.bootstrapServer?.serverId, | 159 | serverId: allEchoObj?.bootstrap?.bootstrapServer?.serverId, |
| 164 | securityMode: allEchoObj?.bootstrap?.bootstrapServer?.securityMode, | 160 | securityMode: allEchoObj?.bootstrap?.bootstrapServer?.securityMode, |
| 165 | - serverPublicKey: | ||
| 166 | - allEchoObj?.bootstrap?.bootstrapServer?.serverPublicKey == null | ||
| 167 | - ? `3059301306072a8648ce3d020106082a8648ce3d03010703420004e353af009b814ee2f9ab393a975e0c | ||
| 168 | - 39e2fff60e3603fd6ee54a43b89a4f56258a7aa9c7e4a577760edb289dc955d91968473ee8a1bfc2b9c423563796113009` | ||
| 169 | - : allEchoObj?.bootstrap?.bootstrapServer?.serverPublicKey, | 161 | + serverPublicKey: allEchoObj?.bootstrap?.bootstrapServer?.serverPublicKey, |
| 170 | clientHoldOffTime: allEchoObj?.bootstrap?.bootstrapServer?.clientHoldOffTime, | 162 | clientHoldOffTime: allEchoObj?.bootstrap?.bootstrapServer?.clientHoldOffTime, |
| 171 | bootstrapServerAccountTimeout2: | 163 | bootstrapServerAccountTimeout2: |
| 172 | allEchoObj?.bootstrap?.servers?.bootstrapServerAccountTimeout, | 164 | allEchoObj?.bootstrap?.servers?.bootstrapServerAccountTimeout, |