sync: 同步生产版 v1.0.4 并脱敏

internal/logic/upstreamapi/upstreamapi.go

@@ -3,14 +3,14 @@ package upstreamapi
 import (
 	"context"
 	"encoding/json"
+	"strings"
+	"sync"
+	"time"
 	"git.5iot.com/iotlcm-public/iotlcm-upstream-proxy/internal/consts"
 	"git.5iot.com/iotlcm-public/iotlcm-upstream-proxy/internal/dao"
 	"git.5iot.com/iotlcm-public/iotlcm-upstream-proxy/internal/model"
 	"git.5iot.com/iotlcm-public/iotlcm-upstream-proxy/internal/model/entity"
 	"git.5iot.com/iotlcm-public/iotlcm-upstream-proxy/internal/service"
-	"strings"
-	"sync"
-	"time"
 
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -317,6 +317,17 @@ func (u *sUpstreamAPI) packChanKey(ctx context.Context, simKeys []*model.SimKey)
 func (u *sUpstreamAPI) SimBase(ctx context.Context, input *model.SimBaseReqJson) (model.SimBaseResJson, error) {
 	output := make([]*model.SimBaseRes[json.RawMessage], 0)
 	inputMap := make(map[string]*model.SimBaseReqJson)
+	// 提交/恢复/查询阶段的代理异常不是运营商办理失败。
+	failureResData := json.RawMessage(`{"status":"-2"}`)
+	var apnRequest struct {
+		SubmitOnly  bool   `json:"submitOnly"`
+		RecoverOnly bool   `json:"recoverOnly"`
+		QueryJobID  string `json:"queryJobId"`
+	}
+	request := g.RequestFromCtx(ctx)
+	if request != nil && request.URL.Path == "/sim/change/sim-apn" && json.Unmarshal(input.ReqData, &apnRequest) == nil && (apnRequest.SubmitOnly || apnRequest.RecoverOnly || apnRequest.QueryJobID != "") {
+		failureResData = json.RawMessage(`{"uncertain":true}`)
+	}
 	chanKeyMap, err := u.packChanKey(ctx, input.SimKeys)
 	if err != nil {
 		return nil, err
@@ -334,7 +345,7 @@ func (u *sUpstreamAPI) SimBase(ctx context.Context, input *model.SimBaseReqJson)
 					SimKey:  simKey,
 					Code:    consts.ApiStatusError,
 					Message: "通道未配置",
-					ResData: json.RawMessage(`{"status": "-2"}`),
+					ResData: failureResData,
 				})
 			}
 			continue
@@ -346,7 +357,7 @@ func (u *sUpstreamAPI) SimBase(ctx context.Context, input *model.SimBaseReqJson)
 					SimKey:  simKey,
 					Code:    consts.ApiStatusError,
 					Message: "通道未实例化",
-					ResData: json.RawMessage(`{"status": "-2"}`),
+					ResData: failureResData,
 				})
 			}
 			continue
@@ -358,7 +369,7 @@ func (u *sUpstreamAPI) SimBase(ctx context.Context, input *model.SimBaseReqJson)
 					SimKey:  simKey,
 					Code:    consts.ApiStatusError,
 					Message: err.Error(),
-					ResData: json.RawMessage(`{"status": "-2"}`),
+					ResData: failureResData,
 				})
 			}
 		} else {