Merge branch 'release/v0.1.1'

xen0n · xen0n · commit 21659cccf0f5 · 2020-01-08T15:55:28.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,10 +15,9 @@ branches:
 cache:
   - $GOPATH/pkg/dep
 before_install:
-  - if [[ "$TRAVIS_GO_VERSION" != "1.13.x" ]]; then go get -u -v github.com/golang/dep/cmd/dep ; fi
+  - export GO111MODULE=on
   - go get -u -v honnef.co/go/tools/cmd/staticcheck
 install:
-  - if [[ "$TRAVIS_GO_VERSION" != "1.13.x" ]]; then dep ensure -v ; fi
   - go install -v ./...
 script:
   - ./ci/run-lint.sh
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ in at least 2 of Qiniu's internal systems.
     - [ ] 删除成员
     - [ ] 批量删除成员
     - [ ] 获取部门成员
-    - [ ] 获取部门成员详情
+    - [x] 获取部门成员详情
     - [ ] userid与openid互换
     - [ ] 二次验证
     - [ ] 邀请成员
diff --git a/apis.md.go b/apis.md.go
diff --git a/cmd/workwxctl/commands/cmd_user_list_by_dept.go b/cmd/workwxctl/commands/cmd_user_list_by_dept.go
@@ -0,0 +1,40 @@
+package commands
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+
+	"gopkg.in/urfave/cli.v2"
+)
+
+func cmdUserListByDept(c *cli.Context) error {
+	cfg := mustGetConfig(c)
+	haveID := c.Args().Len() > 0
+	if !haveID {
+		return errors.New("no department ID given")
+	}
+
+	deptIDStr := c.Args().Get(0)
+	deptID, err := strconv.ParseInt(deptIDStr, 10, 64)
+	if err != nil {
+		fmt.Printf("invalid department ID: %+v\n", err)
+		return err
+	}
+
+	app := cfg.MakeWorkwxApp()
+	// TODO: failed requests currently panics
+	// TODO: fetchChild
+	info, err := app.ListUsersByDeptID(deptID, false)
+
+	if err != nil {
+		fmt.Printf("error = %+v\n", err)
+	} else {
+		fmt.Printf("users in dept ID %d:\n\n", deptID)
+		for _, user := range info {
+			fmt.Printf("    %+v\n", user)
+		}
+	}
+
+	return err
+}
diff --git a/cmd/workwxctl/commands/decl.go b/cmd/workwxctl/commands/decl.go
@@ -42,6 +42,11 @@ func InitApp() *cli.App {
 				Usage:  "读取成员",
 				Action: cmdUserGet,
 			},
+			{
+				Name:   "user-list-by-dept",
+				Usage:  "获取部门成员详情",
+				Action: cmdUserListByDept,
+			},
 			{
 				Name:   "dept-list",
 				Usage:  "获取部门列表",
diff --git a/dept_info.md.go b/dept_info.md.go
diff --git a/docs/apis.md b/docs/apis.md
@@ -18,7 +18,7 @@ Name|Request Type|Response Type|Access Token|URL|Doc
 `execUserDelete`|TODO|TODO|+|`GET /cgi/bin/user/delete`|[删除成员](https://work.weixin.qq.com/api/doc#90000/90135/90198)
 `execUserBatchDelete`|TODO|TODO|+|`POST /cgi/bin/user/batchdelete`|[批量删除成员](https://work.weixin.qq.com/api/doc#90000/90135/90199)
 `execUserSimpleList`|TODO|TODO|+|`GET /cgi-bin/user/simplelist`|[获取部门成员](https://work.weixin.qq.com/api/doc#90000/90135/90200)
-`execUserList`|TODO|TODO|+|`GET /cgi-bin/user/list`|[获取部门成员详情](https://work.weixin.qq.com/api/doc#90000/90135/90201)
+`execUserList`|`reqUserList`|`respUserList`|+|`GET /cgi-bin/user/list`|[获取部门成员详情](https://work.weixin.qq.com/api/doc#90000/90135/90201)
 `execUserConvertToOpenID`|TODO|TODO|+|`POST /cgi-bin/user/convert_to_openid`|[userid与openid互换](https://work.weixin.qq.com/api/doc#90000/90135/90202)
 `execUserAuthSucc`|TODO|TODO|+|`GET /cgi-bin/user/authsucc`|[二次验证](https://work.weixin.qq.com/api/doc#90000/90135/90203)
 `execUserBatchInvite`|TODO|TODO|+|`POST /cgi-bin/batch/invite`|[邀请成员](https://work.weixin.qq.com/api/doc#90000/90135/90975)
diff --git a/docs/dept_info.md b/docs/dept_info.md
@@ -8,5 +8,5 @@ Name|JSON|Type|Doc
 :---|:---|:---|:--
 `ID`|`id`|`int64`|部门 ID
 `Name`|`name`|`string`|部门名称
-`ParentID`|`parent_id`|`int64`|父亲部门id。根部门为1
+`ParentID`|`parentid`|`int64`|父亲部门id。根部门为1
 `Order`|`order`|`uint32`|在父部门中的次序值。order值大的排序靠前。值范围是[0, 2^32)
diff --git a/go.mod b/go.mod
@@ -4,6 +4,9 @@ go 1.12
 
 require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
+	github.com/russross/blackfriday v2.0.0+incompatible
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/smartystreets/goconvey v1.6.4
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
 	gopkg.in/urfave/cli.v2 v2.0.0-20180128182452-d3ae77c26ac8
 )
diff --git a/go.sum b/go.sum
@@ -1,10 +1,26 @@
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk=
+github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 gopkg.in/urfave/cli.v2 v2.0.0-20180128182452-d3ae77c26ac8 h1:Ggy3mWN4l3PUFPfSG0YB3n5fVYggzysUmiUQ89SnX6Y=
 gopkg.in/urfave/cli.v2 v2.0.0-20180128182452-d3ae77c26ac8/go.mod h1:cKXr3E0k4aosgycml1b5z33BVV6hai1Kh7uDgFOkbcs=
diff --git a/internal/sdkcodegen/analyze.go b/internal/sdkcodegen/analyze.go
@@ -1,13 +1,12 @@
-//+build sdkcodegen !go1.13
+//+build sdkcodegen
 
 package main
 
 import (
 	"errors"
 	"strings"
 
-	// this is not currently go1.13-compatible sadly
-	"gopkg.in/russross/blackfriday.v2"
+	"github.com/russross/blackfriday"
 )
 
 var (
diff --git a/internal/sdkcodegen/ast.go b/internal/sdkcodegen/ast.go
@@ -1,12 +1,12 @@
-//+build sdkcodegen !go1.13
+//+build sdkcodegen
 
 package main
 
 import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/russross/blackfriday.v2"
+	"github.com/russross/blackfriday"
 )
 
 type mdNode interface {
diff --git a/internal/sdkcodegen/emit.go b/internal/sdkcodegen/emit.go
@@ -1,4 +1,4 @@
-//+build sdkcodegen !go1.13
+//+build sdkcodegen
 
 package main
 
diff --git a/internal/sdkcodegen/hir.go b/internal/sdkcodegen/hir.go
@@ -1,4 +1,4 @@
-//+build sdkcodegen !go1.13
+//+build sdkcodegen
 
 package main
 
diff --git a/internal/sdkcodegen/main.go b/internal/sdkcodegen/main.go
@@ -1,4 +1,4 @@
-//+build sdkcodegen !go1.13
+//+build sdkcodegen
 
 package main
 
diff --git a/internal/sdkcodegen/parse.go b/internal/sdkcodegen/parse.go
@@ -1,4 +1,4 @@
-//+build sdkcodegen !go1.13
+//+build sdkcodegen
 
 package main
 
@@ -7,7 +7,7 @@ import (
 	"io"
 	"strings"
 
-	"gopkg.in/russross/blackfriday.v2"
+	"github.com/russross/blackfriday"
 )
 
 func parseDocument(content []byte) *mdTocNode {
diff --git a/models.go b/models.go
@@ -114,10 +114,8 @@ func (x reqUserGet) intoURLValues() url.Values {
 	}
 }
 
-// respUserGet 读取成员响应
-type respUserGet struct {
-	respCommon
-
+// respUserDetail 成员详细信息的公共字段
+type respUserDetail struct {
 	UserID         string   `json:"userid"`
 	Name           string   `json:"name"`
 	DeptIDs        []int64  `json:"department"`
@@ -136,6 +134,40 @@ type respUserGet struct {
 	// TODO: extattr external_profile external_position
 }
 
+// respUserGet 读取成员响应
+type respUserGet struct {
+	respCommon
+
+	respUserDetail
+}
+
+// reqUserList 部门成员请求
+type reqUserList struct {
+	DeptID     int64
+	FetchChild bool
+}
+
+var _ urlValuer = reqUserList{}
+
+func (x reqUserList) intoURLValues() url.Values {
+	var fetchChild int64
+	if x.FetchChild {
+		fetchChild = 1
+	}
+
+	return url.Values{
+		"department_id": {strconv.FormatInt(x.DeptID, 10)},
+		"fetch_child":   {strconv.FormatInt(fetchChild, 10)},
+	}
+}
+
+// respUsersByDeptID 部门成员详情响应
+type respUserList struct {
+	respCommon
+
+	Users []*respUserDetail `json:"userlist"`
+}
+
 type reqDeptList struct {
 	HaveID bool
 	ID     int64
diff --git a/user_info.go b/user_info.go
@@ -13,3 +13,20 @@ func (c *WorkwxApp) GetUser(userid string) (*UserInfo, error) {
 	obj := resp.intoUserInfo()
 	return &obj, nil
 }
+
+// ListUsersByDeptID 获取部门成员详情
+func (c *WorkwxApp) ListUsersByDeptID(deptID int64, fetchChild bool) ([]*UserInfo, error) {
+	resp, err := c.execUserList(reqUserList{
+		DeptID:     deptID,
+		FetchChild: fetchChild,
+	})
+	if err != nil {
+		return nil, err
+	}
+	users := make([]*UserInfo, len(resp.Users))
+	for index, user := range resp.Users {
+		userInfo := user.intoUserInfo()
+		users[index] = &userInfo
+	}
+	return users, nil
+}
diff --git a/user_info_helper.go b/user_info_helper.go
@@ -36,7 +36,7 @@ func mustFromGenderStr(x string) UserGender {
 	return UserGender(n)
 }
 
-func (x respUserGet) intoUserInfo() UserInfo {
+func (x respUserDetail) intoUserInfo() UserInfo {
 	deptInfo := reshapeDeptInfo(x.DeptIDs, x.DeptOrder, x.IsLeaderInDept)
 
 	return UserInfo{

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@ go 1.12`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/cenkalti/backoff v2.2.1+incompatible`
	`7`	`+ github.com/russross/blackfriday v2.0.0+incompatible`
	`8`	`+ github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect`
	`9`	`+ github.com/smartystreets/goconvey v1.6.4`
`7`	`10`	`golang.org/x/net v0.0.0-20190724013045-ca1201d0de80`
`8`	`11`	`gopkg.in/urfave/cli.v2 v2.0.0-20180128182452-d3ae77c26ac8`
`9`	`12`	`)`