Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_base

web/controllers/base/base.go

@@ -387,11 +387,11 @@ func RegisterRoutes() {
 		// Uom的服务实例
 		var serviceOfUom = svr.NewUomService()
 		// Uom插入一条
-		// RegisterInsertOneUom(uom, "/insertone", serviceOfUom.InsertOne)
+		RegisterInsertOneUom(uom, "/insertone", serviceOfUom.InsertOne)
 		// Uom插入多条
 		// RegisterInsertUom(uom, "/insert", serviceOfUom.Insert)
 		// Uom删除一条
-		// RegisterDeleteOneUom(uom, "/deleteone", serviceOfUom.DeleteOne)
+		RegisterDeleteOneUom(uom, "/deleteone", serviceOfUom.DeleteOne)
 		// Uom删除多条
 		// RegisterDeleteUom(uom, "/delete", serviceOfUom.Delete)
 		// Uom查询多条
@@ -399,7 +399,7 @@ func RegisterRoutes() {
 		// Uom查询一条
 		RegisterSelectOneUom(uom, "/get", serviceOfUom.SelectOne)
 		// Uom修改一条
-		// RegisterUpdateOneUom(uom, "/updateone", serviceOfUom.UpdateOne)
+		RegisterUpdateOneUom(uom, "/updateone", serviceOfUom.UpdateOne)
 		// Uom修改多条
 		// RegisterUpdateUom(uom, "/update", serviceOfUom.Update)
 

web/controllers/me/me.go

@@ -29,11 +29,11 @@ func RegisterRoutes() {
 		// Project的服务实例
 		var serviceOfProject = svr.NewProjectService()
 		// Project插入一条
-		// RegisterInsertOneProject(project, "/insertone", serviceOfProject.InsertOne)
+		RegisterInsertOneProject(project, "/insertone", serviceOfProject.InsertOne)
 		// Project插入多条
 		// RegisterInsertProject(project, "/insert", serviceOfProject.Insert)
 		// Project删除一条
-		// RegisterDeleteOneProject(project, "/deleteone", serviceOfProject.DeleteOne)
+		RegisterDeleteOneProject(project, "/deleteone", serviceOfProject.DeleteOne)
 		// Project删除多条
 		// RegisterDeleteProject(project, "/delete", serviceOfProject.Delete)
 		// Project查询多条
@@ -41,7 +41,7 @@ func RegisterRoutes() {
 		// Project查询一条
 		RegisterSelectOneProject(project, "/get", serviceOfProject.SelectOne)
 		// Project修改一条
-		// RegisterUpdateOneProject(project, "/updateone", serviceOfProject.UpdateOne)
+		RegisterUpdateOneProject(project, "/updateone", serviceOfProject.UpdateOne)
 		// Project修改多条
 		// RegisterUpdateProject(project, "/update", serviceOfProject.Update)
 
@@ -50,11 +50,11 @@ func RegisterRoutes() {
 		// SetupMatrix的服务实例
 		var serviceOfSetupMatrix = svr.NewSetupMatrixService()
 		// SetupMatrix插入一条
-		// RegisterInsertOneSetupMatrix(setupmatrix, "/insertone", serviceOfSetupMatrix.InsertOne)
+		RegisterInsertOneSetupMatrix(setupmatrix, "/insertone", serviceOfSetupMatrix.InsertOne)
 		// SetupMatrix插入多条
 		// RegisterInsertSetupMatrix(setupmatrix, "/insert", serviceOfSetupMatrix.Insert)
 		// SetupMatrix删除一条
-		// RegisterDeleteOneSetupMatrix(setupmatrix, "/deleteone", serviceOfSetupMatrix.DeleteOne)
+		RegisterDeleteOneSetupMatrix(setupmatrix, "/deleteone", serviceOfSetupMatrix.DeleteOne)
 		// SetupMatrix删除多条
 		// RegisterDeleteSetupMatrix(setupmatrix, "/delete", serviceOfSetupMatrix.Delete)
 		// SetupMatrix查询多条
@@ -62,7 +62,7 @@ func RegisterRoutes() {
 		// SetupMatrix查询一条
 		RegisterSelectOneSetupMatrix(setupmatrix, "/get", serviceOfSetupMatrix.SelectOne)
 		// SetupMatrix修改一条
-		// RegisterUpdateOneSetupMatrix(setupmatrix, "/updateone", serviceOfSetupMatrix.UpdateOne)
+		RegisterUpdateOneSetupMatrix(setupmatrix, "/updateone", serviceOfSetupMatrix.UpdateOne)
 		// SetupMatrix修改多条
 		// RegisterUpdateSetupMatrix(setupmatrix, "/update", serviceOfSetupMatrix.Update)
 	})

web/routes/routes.go

@@ -10,6 +10,7 @@ import (
 	_ "LAPP_GAAS_GFrame_BACKEND/web/controllers/om"
 	_ "LAPP_GAAS_GFrame_BACKEND/web/controllers/pm"
 	_ "LAPP_GAAS_GFrame_BACKEND/web/controllers/qm"
+	_ "LAPP_GAAS_GFrame_BACKEND/web/controllers/me"
 	"LAPP_GAAS_GFrame_BACKEND/web/middleware"
 	"LAPP_GAAS_GFrame_BACKEND/web/middleware/cors"
 	"github.com/kataras/iris/v12"