init

service/api_gateway_service.go

@@ -28,7 +28,7 @@ func NewApiGatewayService() ApiGatewayService {
     }
 }
 
-func (a *apiGatewayService) Get(apiCode string, m map[string]interface{}) (map[string]interface{}, error) {
+func (a *apiGatewayService) Get(apiCode string, m map[string]interface{})(map[string]interface{}, error) {
     apiDef, err1 := cache.GetApiData(apiCode)
     if err1 != nil{
         return nil, err1
@@ -40,11 +40,10 @@ func (a *apiGatewayService) Get(apiCode string, m map[string]interface{}) (map[s
         return nil, err2
     }
     sqlStatement := apiDef.SqlStatement
-    
     return a.dataBus.GetById(sqlStatement, m)
 }
 
-func (a *apiGatewayService) GetList(apiCode string, m map[string]interface{}) ([]map[string]interface{}, error) {
+func (a *apiGatewayService) GetList(apiCode string, m map[string]interface{})([]map[string]interface{}, error) {
     apiDef, err1 := cache.GetApiData(apiCode)
     if err1 != nil{
         return nil, err1
@@ -56,7 +55,6 @@ func (a *apiGatewayService) GetList(apiCode string, m map[string]interface{}) ([
         return nil, err2
     }
     sqlStatement := apiDef.SqlStatement
-    
     return a.dataBus.GetList(sqlStatement, m)
 }
 
@@ -82,19 +80,13 @@ func (a *apiGatewayService) Create(apiCode string, m map[string]interface{}) err
     if err1 != nil{
         return err1
     }
-    
     objectCode := apiDef.ObjectCode
     _, err2 := cache.GetBizObjectData(objectCode)
     if err2 != nil {
         return err2
     }
     
-    err3 := a.dataBus.Create(objectCode, m)
-    if err3 != nil {
-        return err3
-    }
-    
-    return nil
+    return a.dataBus.Create(objectCode, m)
 }
 
 func (a *apiGatewayService) Update(apiCode string, m map[string]interface{}) error {
@@ -109,12 +101,7 @@ func (a *apiGatewayService) Update(apiCode string, m map[string]interface{}) err
         return err2
     }
     
-    err3 := a.dataBus.Update(objectCode, m)
-    if err3 != nil {
-        return err3
-    }
-    
-    return nil
+    return a.dataBus.Update(objectCode, m)
 }
 
 func (a *apiGatewayService) Patch(apiCode string, m map[string]interface{}) error {
@@ -129,11 +116,7 @@ func (a *apiGatewayService) Patch(apiCode string, m map[string]interface{}) erro
         return err2
     }
     
-    err3 := a.dataBus.Patch(objectCode, m)
-    if err3 != nil {
-        return err3
-    }
-    return nil
+    return a.dataBus.Patch(objectCode, m)
 }
 
 func (a *apiGatewayService) Delete(apiCode string, m map[string]interface{}) error {
@@ -148,9 +131,5 @@ func (a *apiGatewayService) Delete(apiCode string, m map[string]interface{}) err
         return err2
     }
     
-    err3 := a.dataBus.Delete(objectCode, m)
-    if err3 != nil {
-        return err3
-    }
-    return nil
+    return a.dataBus.Delete(objectCode, m)
 }

web/controllers/model_object_oam_controller.go

@@ -12,7 +12,7 @@ type ModelObjectOAMController struct {
 }
 
 func (c *ModelObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",     "/",                                                "GetList"   )
+    b.Handle("GET",     "",                                                 "GetList"   )
     b.Handle("GET",     "/{modelId:int64}/{objectId:int64}/{oamId:int64}",  "GetById"   )
     b.Handle("POST",    "/add",                                             "Create"    )
     b.Handle("PUT",     "/update",                                          "Update"    )

web/router/routes.go

@@ -158,7 +158,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 		modelObjectApp.Handle(new(controllers.ModelObjectController))
 		
 		modelObjectAttrService := service.NewModelObjectAttrService()
-		modelObjectAttrApp := mvc.New(modelParty.Party("/object/attribute"))
+		modelObjectAttrApp := mvc.New(modelParty.Party("/object/attr"))
 		modelObjectAttrApp.Register(modelObjectAttrService)
 		modelObjectAttrApp.Handle(new(controllers.ModelObjectAttrController))
 		
@@ -184,7 +184,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 		bizObjectApp.Handle(new(controllers.BizObjectController))
 		
 		bizObjectAttrService := service.NewModelObjectAttrService()
-		bizObjectAttrApp := mvc.New(bizParty.Party("/object/attribute"))
+		bizObjectAttrApp := mvc.New(bizParty.Party("/object/attr"))
 		bizObjectAttrApp.Register(bizObjectAttrService)
 		bizObjectAttrApp.Handle(new(controllers.BizObjectAttrController))