Merge remote-tracking branch 'origin/mark' into don

controllers/auth2.go

@@ -93,8 +93,8 @@ func (c *Auth2Controller) GetTokenInfo() {
 	})
 }
 
-// @Title 微信认证回调接口
-// @Description 微信认证回调接口，自己不能直接调用
+// @Title 微信扫码认证回调接口
+// @Description 微信扫码认证回调接口，自己不能直接调用
 // @Param	code		query		string		true	"客户同意后得到的code"
 // @Param	block		query		string		true	"回调地址"
 // @Param	state		query		string		false	"微信回调的登录状态"

controllers/cms_user2.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"git.rosy.net.cn/jx-callback/business/auth2"
+	"git.rosy.net.cn/jx-callback/business/authz"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -71,3 +72,132 @@ func (c *User2Controller) GetUsers() {
 		return retVal, "", err
 	})
 }
+
+// @Title 得到用户自己的门店列表
+// @Description 得到用户自己的门店列表
+// @Param	token			header		string	true	"认证token"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetMyStoreList [get]
+func (c *User2Controller) GetMyStoreList() {
+	c.callGetMyStoreList(func(params *tUser2GetMyStoreListParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.GetMyStoreListNew(params.Ctx)
+		return retVal, "", err
+	})
+}
+
+// @Title 得到可用的门店角色列表
+// @Description 得到可用的门店角色列表
+// @Param	token			header		string	true	"认证token"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetStoreRoleList [get]
+func (c *User2Controller) GetStoreRoleList() {
+	c.callGetStoreRoleList(func(params *tUser2GetStoreRoleListParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.GetStoreRoleList(params.Ctx)
+		return retVal, "", err
+	})
+}
+
+// @Title 得到用户所具有的角色列表
+// @Description 得到用户所具有的角色列表
+// @Param	token			header		string	true	"认证token"
+// @Param	userID			query		string	true	"用户i"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetUserRoleList [get]
+func (c *User2Controller) GetUserRoleList() {
+	c.callGetUserRoleList(func(params *tUser2GetUserRoleListParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.GetUserRoleList(params.Ctx, params.UserID)
+		return retVal, "", err
+	})
+}
+
+// @Title 得到角色包括的用户列表
+// @Description 得到角色包括的用户列表
+// @Param	token			header		string	true	"认证token"
+// @Param	roleName		query		string	true	"角色名"
+// @Param	storeID			query		int		false	"门店ID（如果是全局角色不用填）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetRoleUserList [get]
+func (c *User2Controller) GetRoleUserList() {
+	c.callGetRoleUserList(func(params *tUser2GetRoleUserListParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.GetRoleUserList(params.Ctx, authz.NewRole(params.RoleName, params.StoreID))
+		return retVal, "", err
+	})
+}
+
+// @Title 给指定用户添加角色列表
+// @Description 给指定用户添加角色列表
+// @Param	token			header		string	true	"认证token"
+// @Param	userID			query		string	true	"用户ID"
+// @Param	roleList		query		string	true	"角色列表"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /AddRoles4User [post]
+func (c *User2Controller) AddRoles4User() {
+	c.callAddRoles4User(func(params *tUser2AddRoles4UserParams) (retVal interface{}, errCode string, err error) {
+		var roleList []*authz.RoleInfo
+		if err = jxutils.Strings2Objs(params.RoleList, &roleList); err == nil {
+			err = cms.AddRoles4User(params.Ctx, params.UserID, roleList)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 给指定用户删除角色列表
+// @Description 给指定用户删除角色列表
+// @Param	token			header		string	true	"认证token"
+// @Param	userID			query		string	true	"用户ID"
+// @Param	roleList		query		string	true	"角色列表"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /DeleteRoles4User [delete]
+func (c *User2Controller) DeleteRoles4User() {
+	c.callDeleteRoles4User(func(params *tUser2DeleteRoles4UserParams) (retVal interface{}, errCode string, err error) {
+		var roleList []*authz.RoleInfo
+		if err = jxutils.Strings2Objs(params.RoleList, &roleList); err == nil {
+			err = cms.DeleteRoles4User(params.Ctx, params.UserID, roleList)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 给指定角色添加用户列表
+// @Description 给指定角色添加用户列表
+// @Param	token			header		string	true	"认证token"
+// @Param	roleName		query		string	true	"角色名"
+// @Param	storeID			query		int		false	"门店ID"
+// @Param	userIDs			query		string	true	"用户ID列表"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /AddUsers4Role [post]
+func (c *User2Controller) AddUsers4Role() {
+	c.callAddUsers4Role(func(params *tUser2AddUsers4RoleParams) (retVal interface{}, errCode string, err error) {
+		var userIDs []string
+		if err = jxutils.Strings2Objs(params.UserIDs, &userIDs); err == nil {
+			err = cms.AddUsers4Role(params.Ctx, authz.NewRole(params.RoleName, params.StoreID), userIDs)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 给指定角色删除用户列表
+// @Description 给指定角色删除用户列表
+// @Param	token			header		string	true	"认证token"
+// @Param	roleName		query		string	true	"角色名"
+// @Param	storeID			query		int		false	"门店ID"
+// @Param	userIDs			query		string	true	"用户ID列表"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /DeleteUsers4Role [delete]
+func (c *User2Controller) DeleteUsers4Role() {
+	c.callDeleteUsers4Role(func(params *tUser2DeleteUsers4RoleParams) (retVal interface{}, errCode string, err error) {
+		var userIDs []string
+		if err = jxutils.Strings2Objs(params.UserIDs, &userIDs); err == nil {
+			err = cms.DeleteUsers4Role(params.Ctx, authz.NewRole(params.RoleName, params.StoreID), userIDs)
+		}
+		return retVal, "", err
+	})
+}