Преглед на файлове

用户添加,用户角色显示修改

huahaiyan преди 6 години
родител
ревизия
1cb55e3bca

+ 2 - 1
src/dashoo.cn/backend/api/conf/app.conf

@@ -68,4 +68,5 @@ type=mysql
 name=casbin
 host=47.92.212.59
 user=root
-pwd=zks123456
+pwd=zks123456
+domain=lims

+ 9 - 8
src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -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 编辑用户

+ 2 - 1
src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -316,8 +316,9 @@
         this.selectedrole = []
         let _this = this
         // request
-        this.$axios.get('casb/users/getuserrole/' + this.selecteduserid, {})
+        this.$axios.get('users/getuserrole/' + this.selecteduserid, {})
           .then(res => {
+            console.log("-------res----",res.data)
             _this.mustrolelist = []
             // response
             for (let i = 0; i < res.data.length; i++) {