liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rosy-zhudan
2019-08-07 09:06:50 +08:00
parent 1d30cad9c2 e3e900cd10
commit f5208eea28
39 changed files with 650 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/auth2.go
View File

@@ -73,9 +73,9 @@ func (c *Auth2Controller) Login() {
})
}
// @Title 钉钉认证回调接口
// @Description 钉钉认证回调接口，自己不能直接调用
// @Param token header string true "认证token"
// @Title 得到自己登录token的信息
// @Description 得到自己登录token的信息
// @Param token header string true "认证token"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetTokenInfo [get]
@@ -240,10 +240,10 @@ func (c *Auth2Controller) AddAuthBind() {
// @Title 删除认证方式
// @Description 删除认证方式
// @Param token header string true "认证token"
// @Param authType formData string true "登录类型，参见Login的描述"
// @Param authType query string true "登录类型，参见Login的描述"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /RemoveAuthBind [post]
// @router /RemoveAuthBind [delete]
func (c *Auth2Controller) RemoveAuthBind() {
c.callRemoveAuthBind(func(params *tAuth2RemoveAuthBindParams) (retVal interface{}, errCode string, err error) {
authInfo, err2 := params.Ctx.GetV2AuthInfo()

12
controllers/cms_user2.go
View File

@@ -54,16 +54,20 @@ func (c *User2Controller) GetBindAuthInfo() {
// @Title 得到用户列表
// @Description 得到用户列表
// @Param token header string true "认证token"
// @Param userType query int true "用户类型"
// @Param userID2 query string faslse "用户id2"
// @Param userType query int true "用户类型（0表示全部）"
// @Param keyword query string faslse "关键字，可以部分匹配"
// @Param userIDs query string faslse "用户id列表"
// @Param userID2 query string faslse "用户id2，必须全匹配（外部唯一标识）"
// @Param mobile query string faslse "用户手机，必须全匹配"
// @Param userName query string faslse "用户名，可以部分匹配"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetUsers [get]
func (c *User2Controller) GetUsers() {
c.callGetUsers(func(params *tUser2GetUsersParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetUsers(params.Ctx, params.UserType, params.UserID2, params.Mobile, params.UserName)
var userIDs []string
if err = jxutils.Strings2Objs(params.UserIDs, &userIDs); err == nil {
retVal, err = cms.GetUsers(params.Ctx, params.UserType, params.Keyword, userIDs, params.UserID2, params.Mobile)
}
return retVal, "", err
})
}