后端配置文件

src/dashoo.cn/backend/api/conf/auth_model.conf

@@ -2,7 +2,7 @@
 r = sub, dom, obj, act
 
 [policy_definition]
-p = sub, dom, obj, act
+p = sub, dom, obj, act, eft
 
 [role_definition]
 #角色
@@ -13,9 +13,11 @@ g2 = _, _, _
 g3 = _, _, _
 #区域
 g4 = _, _, _
+#容器
+g5 = _, _, _
 
 [policy_effect]
 e = some(where (p.eft == allow))
 
 [matchers]
-m = g(r.sub, p.sub, r.dom) && g2(r.sub, p.sub, r.dom) && g3(r.sub, p.sub, r.dom) && g4(r.sub, p.sub, r.dom) && r.dom == p.dom && r.obj == p.obj && r.act == p.act
+m = g(r.sub, p.sub, r.dom) && g2(r.sub, r.dom, p.sub) && g3(r.sub, r.dom, p.sub) && g4(r.sub, r.dom, p.sub) && g5(r.sub, r.dom, p.sub) && r.dom == p.dom && r.obj == p.obj && r.act == p.act

src/dashoo.cn/backend/api/routers/router.go

@@ -9,7 +9,9 @@ import (
 	"dashoo.cn/backend/api/controllers/casbin"
 	"dashoo.cn/backend/api/controllers/document"
 	"dashoo.cn/backend/api/controllers/equipment"
+	"dashoo.cn/backend/api/controllers/extends"
 	"dashoo.cn/backend/api/controllers/family"
+	"dashoo.cn/backend/api/controllers/flupplan"
 	"dashoo.cn/backend/api/controllers/instrument"
 	"dashoo.cn/backend/api/controllers/logs"
 	"dashoo.cn/backend/api/controllers/material"
@@ -57,7 +59,7 @@ func init() {
 				&casbin.RoleController{},
 			),
 		),
-		beego.NSNamespace("/permission",
+		beego.NSNamespace("/permissions",
 			beego.NSInclude(
 				&casbin.PermissionController{},
 			),
@@ -211,12 +213,12 @@ func init() {
 		),
 		beego.NSNamespace("/familyman",
 			beego.NSInclude(
-				&family.CustomerController{},
+				&family.FamilymanController{},
 			),
 		),
 		beego.NSNamespace("/familydetail",
 			beego.NSInclude(
-				&family.CustomerController{},
+				&family.FamilydetailController{},
 			),
 		),
 		//样本管理
@@ -306,12 +308,44 @@ func init() {
 				&biobank.SampleTest_vController{},
 			),
 		),
+		//扩展信息
+		beego.NSNamespace("/extends",
+			beego.NSInclude(
+				&extends.ExtendsController{},
+			),
+		),
+		beego.NSNamespace("/samplenoteitem",
+			beego.NSInclude(
+				&extends.SamplenoteitemController{},
+			),
+		),
+		beego.NSNamespace("/samplesite",
+			beego.NSInclude(
+				&extends.SampleSiteController{},
+			),
+		),
+		beego.NSNamespace("/stypenoteitem",
+			beego.NSInclude(
+				&extends.StypenoteitemController{},
+			),
+		),
 		//文件管理
 		beego.NSNamespace("/document",
 			beego.NSInclude(
 				&document.DocumentController{},
 			),
 		),
+		//随访管理
+		beego.NSNamespace("/flupplan",
+			beego.NSInclude(
+				&flupplan.FlupplanController{},
+			),
+		),
+		beego.NSNamespace("/willfluprecord",
+			beego.NSInclude(
+				&flupplan.WillfluprecordController{},
+			),
+		),
 		//日志管理
 		beego.NSNamespace("/loginlog",
 			beego.NSInclude(