Merge d55a170570 into 9bfebc8a27

fix DepartmentGet with commonError is invalid or not struct

.github/workflows/release.yml

@@ -1,29 +0,0 @@
-name: goreleaser
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      -
-        name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.16
-      -
-        name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
-        with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yml

@@ -1,29 +0,0 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
-before:
-  hooks:
-    # You may remove this if you don't use go modules.
-    - go mod download
-    # you may remove this if you don't need go generate
-    - go generate ./...
-builds:
-- skip: true
-
-archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
-
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ .Tag }}-next"
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'

cache/memory.go

@@ -26,25 +26,31 @@ func NewMemory() *Memory {
 
 // Get return cached value
 func (mem *Memory) Get(key string) interface{} {
+	mem.Lock()
 	if ret, ok := mem.data[key]; ok {
+		mem.Unlock()
 		if ret.Expired.Before(time.Now()) {
 			mem.deleteKey(key)
 			return nil
 		}
 		return ret.Data
 	}
+	mem.Unlock()
 	return nil
 }
 
 // IsExist check value exists in memcache.
 func (mem *Memory) IsExist(key string) bool {
+	mem.Lock()
 	if ret, ok := mem.data[key]; ok {
+		mem.Unlock()
 		if ret.Expired.Before(time.Now()) {
 			mem.deleteKey(key)
 			return false
 		}
 		return true
 	}
+	mem.Unlock()
 	return false
 }
 

work/addresslist/department.go

@@ -58,6 +58,11 @@ type (
 		ParentID         int      `json:"parentid"`          // 父部门id。根部门为1
 		Order            int      `json:"order"`             // 在父部门中的次序值。order值大的排序靠前
 	}
+	// DepartmentGetResponse 获取单个部门详情
+	DepartmentGetResponse struct {
+		util.CommonError
+		Department Department `json:"department"`
+	}
 )
 
 // DepartmentCreate 创建部门
@@ -138,9 +143,9 @@ func (r *Client) DepartmentGet(departmentID int) (*Department, error) {
 	if response, err = util.HTTPGet(fmt.Sprintf(departmentGetURL, accessToken, departmentID)); err != nil {
 		return nil, err
 	}
-	result := &Department{}
+	result := &DepartmentGetResponse{}
 	if err = util.DecodeWithError(response, result, "DepartmentGet"); err != nil {
 		return nil, err
 	}
-	return result, nil
+	return &result.Department, nil
 }