houyaf il y a 3 ans
Parent
commit
ddf7b9c89d
3 fichiers modifiés avec 25 ajouts et 13 suppressions
  1. 1 1
      service/db_service.go
  2. 14 2
      web/controllers/db_controller.go
  3. 10 10
      web/router/routes.go

+ 1 - 1
service/db_service.go

@@ -17,7 +17,7 @@ type dbService struct {
 
 func NewDbService() DbService {
     return &dbService{
-        repo: repositories.NewDbRepo(datasource.InstanceMaster()),
+        repo: repositories.NewDbRepo(datasource.InstanceSlave()),
     }
 }
 

+ 14 - 2
web/controllers/db_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
     "github.com/kataras/iris/v12/mvc"
+    "xps/cache"
     "xps/service"
 )
 
@@ -11,8 +12,10 @@ type DbController struct {
 }
 
 func (c *DbController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/{objectCode:string}",     "GetList"    )
-    b.Handle("GET",         "/{objectCode:string}/page","GetPage"    )
+    b.Handle("GET",         "/table/{objectCode:string}",         "GetList"      )
+    b.Handle("GET",         "/table/{objectCode:string}/page",    "GetPage"      )
+    b.Handle("GET",         "/table/{objectCode:string}/fields",  "GetFields"    )
+    
 }
 
 func (c *DbController) GetList(objectCode string) *JsonResult {
@@ -31,4 +34,13 @@ func (c *DbController) GetPage(objectCode string) *JsonResult {
     } else {
         return ResultOk("获取成功", data)
     }
+}
+
+func (c *DbController) GetFields(objectCode string) *JsonResult {
+    attrs, err :=  cache.GetModelObjectAttrs(objectCode)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", attrs)
+    }
 }

+ 10 - 10
web/router/routes.go

@@ -219,18 +219,18 @@ func Configure(b *bootstrap.Bootstrapper) {
 	}
 	
 	// database
-	databaseParty := b.Party("/db", crs).AllowMethods(iris.MethodOptions)
+	dbParty := b.Party("/db", crs).AllowMethods(iris.MethodOptions)
 	{
-		databaseParty.Use(middleware.AuthToken)
-		databaseTypeService := service.NewDbTypeService()
-		databaseTypeApp := mvc.New(databaseParty.Party("/type"))
-		databaseTypeApp.Register(databaseTypeService)
-		databaseTypeApp.Handle(new(controllers.DbTypeController))
+		dbParty.Use(middleware.AuthToken)
+		dbTypeService := service.NewDbTypeService()
+		dbTypeApp := mvc.New(dbParty.Party("/type"))
+		dbTypeApp.Register(dbTypeService)
+		dbTypeApp.Handle(new(controllers.DbTypeController))
 		
-		dataService := service.NewDbTypeService()
-		dataApp := mvc.New(databaseParty.Party("/data"))
-		dataApp.Register(dataService)
-		dataApp.Handle(new(controllers.DbTypeController))
+		dbService := service.NewDbService()
+		dbApp := mvc.New(dbParty.Party(""))
+		dbApp.Register(dbService)
+		dbApp.Handle(new(controllers.DbController))
 	}
 	
 	// Api