#3032

update specification query api

models/resource_specification.go

@@ -209,15 +209,15 @@ func (s *Specification) ToShow() *SpecificationShow {
 }
 
 type SpecificationShow struct {
-	ID              int64
-	AccCardsNum     int
-	AccCardType     string
-	CpuCores        int
-	MemGiB          float32
-	GPUMemGiB       float32
-	ShareMemGiB     float32
-	ComputeResource string
-	UnitPrice       int
+	ID              int64   `json:"id"`
+	AccCardsNum     int     `json:"acc_cards_num"`
+	AccCardType     string  `json:"acc_card_type"`
+	CpuCores        int     `json:"cpu_cores"`
+	MemGiB          float32 `json:"mem_gi_b"`
+	GPUMemGiB       float32 `json:"gpu_mem_gi_b"`
+	ShareMemGiB     float32 `json:"share_mem_gi_b"`
+	ComputeResource string  `json:"compute_resource"`
+	UnitPrice       int     `json:"unit_price"`
 }
 
 func InsertResourceSpecification(r ResourceSpecification) (int64, error) {

routers/api/v1/repo/spec.go

@@ -15,7 +15,7 @@ func GetResourceSpec(ctx *context.APIContext) {
 	aiCenterCode := ctx.Query("center")
 	if jobType == "" || computeResource == "" || cluster == "" {
 		log.Info("GetResourceSpec api.param error")
-		ctx.JSON(200, response.ResponseBizError(response.PARAM_ERROR))
+		ctx.JSON(200, response.OuterBizError(response.PARAM_ERROR))
 		return
 	}
 	specs, err := resource.FindAvailableSpecs4Show(ctx.User.ID, models.FindSpecsOptions{
@@ -26,11 +26,11 @@ func GetResourceSpec(ctx *context.APIContext) {
 	})
 	if err != nil {
 		log.Error("GetResourceSpec api error. %v", err)
-		ctx.JSON(200, response.ResponseError(err))
+		ctx.JSON(200, response.OuterServerError(err.Error()))
 		return
 	}
 
 	specMap := make(map[string]interface{}, 0)
-	specMap["Specs"] = specs
-	ctx.JSON(200, response.SuccessWithData(specMap))
+	specMap["specs"] = specs
+	ctx.JSON(200, response.OuterSuccessWithData(specMap))
 }

routers/response/api_response.go

@@ -0,0 +1,30 @@
+package response
+
+type AiforgeOuterResponse struct {
+	Code int         `json:"code"`
+	Msg  string      `json:"msg"`
+	Data interface{} `json:"data"`
+}
+
+func OuterSuccess() *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: RESPONSE_CODE_SUCCESS, Msg: RESPONSE_MSG_SUCCESS}
+}
+
+func OuterError(code int, msg string) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: code, Msg: msg}
+}
+
+func OuterServerError(msg string) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: RESPONSE_CODE_ERROR_DEFAULT, Msg: msg}
+}
+
+func OuterBizError(err *BizError) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: err.Code, Msg: err.Err}
+}
+
+func OuterSuccessWithData(data interface{}) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: RESPONSE_CODE_SUCCESS, Msg: RESPONSE_MSG_SUCCESS, Data: data}
+}
+func OuterErrorWithData(code int, msg string, data interface{}) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: code, Msg: msg, Data: data}
+}