|
|
@@ -1,16 +1,16 @@
|
|
|
package casbin
|
|
|
|
|
|
import (
|
|
|
- "dashoo.cn/backend/api/business/organize"
|
|
|
- "dashoo.cn/business2/userRole"
|
|
|
- "dashoo.cn/business2/permission"
|
|
|
- "dashoo.cn/backend/api/models"
|
|
|
"encoding/json"
|
|
|
"strings"
|
|
|
|
|
|
+ "dashoo.cn/backend/api/business/organize"
|
|
|
+ "dashoo.cn/backend/api/models"
|
|
|
+ "dashoo.cn/business2/permission"
|
|
|
+ "dashoo.cn/business2/userRole"
|
|
|
+
|
|
|
. "dashoo.cn/backend/api/controllers"
|
|
|
"dashoo.cn/utils"
|
|
|
-
|
|
|
)
|
|
|
|
|
|
// Operations about Users
|
|
|
@@ -96,7 +96,7 @@ func (this *UserController) GetUserModuleTree() {
|
|
|
// @router /getuserrole/:id [get]
|
|
|
func (this *UserController) UserPowerCheckRole() {
|
|
|
userid := this.Ctx.Input.Param(":id")
|
|
|
- roleofuser := utils.RBAC.GetRolesForUser("uid_" + userid)
|
|
|
+ roleofuser := utils.RBAC.GetRolesForUserInDomain("uid_"+userid, utils.DOMAIN)
|
|
|
for i := 0; i < len(roleofuser); i++ {
|
|
|
roleofuser[i] = strings.Replace(roleofuser[i], "rid_", "", 1)
|
|
|
}
|
|
|
@@ -164,13 +164,14 @@ func (this *UserController) UserPowerPostRole() {
|
|
|
this.ServeJSON()
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
// @Title 创建用户
|
|
|
// @Description 创建用户
|
|
|
// @Param body body business.device.DeviceChannels "传感器信息"
|
|
|
// @Success 200 {object} controllers.Request
|
|
|
// @router / [post]
|
|
|
func (this *UserController) AddUser() {
|
|
|
- /*var model UserModel
|
|
|
+ var model UserModel
|
|
|
var jsonblob = this.Ctx.Input.RequestBody
|
|
|
json.Unmarshal(jsonblob, &model)
|
|
|
var errinfo ErrorDataInfo
|
|
|
@@ -242,7 +243,7 @@ func (this *UserController) AddUser() {
|
|
|
this.Data["json"] = &errinfo
|
|
|
this.ServeJSON()
|
|
|
return
|
|
|
- }*/
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// @Title 编辑用户
|