From 0ca7ad94b4720d0d8aa36ff75a58964bbf2ac507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Wed, 27 Jul 2022 21:35:37 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A1=20feat:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B5=9E=E5=8A=A9=E9=A1=B5,=E4=BB=A5=E5=8F=8A=E6=9A=B4?= =?UTF-8?q?=E6=BC=8F=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=90=8D=E5=AD=97=20(#98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/FUNDING.yml | 13 +++++++++++++ logic/dingtalk_logic.go | 4 ++-- logic/feishu_logic.go | 4 ++-- logic/wecom_logic.go | 4 ++-- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..5948323 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,13 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry +custom: ['http://ldapdoc.eryajf.net/pages/2b6725/'] diff --git a/logic/dingtalk_logic.go b/logic/dingtalk_logic.go index 626674c..435eb45 100644 --- a/logic/dingtalk_logic.go +++ b/logic/dingtalk_logic.go @@ -72,7 +72,7 @@ func (d DingTalkLogic) AddDepts(group *model.Group) error { if !isql.Group.Exist(tools.H{"group_dn": group.GroupDN}) { // 判断当前部门是否已落库 err = CommonAddGroup(group) if err != nil { - return tools.NewOperationError(fmt.Errorf("添加部门失败：%s", err.Error())) + return tools.NewOperationError(fmt.Errorf("添加部门: %s, 失败: %s", group.GroupName, err.Error())) } } return nil @@ -156,7 +156,7 @@ func (d DingTalkLogic) AddUsers(user *model.User) error { // 新增用户 err = CommonAddUser(user, groups) if err != nil { - return err + return tools.NewOperationError(fmt.Errorf("添加用户: %s, 失败: %s", user.Username, err.Error())) } } return nil diff --git a/logic/feishu_logic.go b/logic/feishu_logic.go index 51f623b..0b884c1 100644 --- a/logic/feishu_logic.go +++ b/logic/feishu_logic.go @@ -74,7 +74,7 @@ func (d FeiShuLogic) AddDepts(group *model.Group) error { if !isql.Group.Exist(tools.H{"group_dn": group.GroupDN}) { err = CommonAddGroup(group) if err != nil { - return tools.NewOperationError(fmt.Errorf("添加部门失败：%s", err.Error())) + return tools.NewOperationError(fmt.Errorf("添加部门: %s, 失败: %s", group.GroupName, err.Error())) } } return nil @@ -158,7 +158,7 @@ func (d FeiShuLogic) AddUsers(user *model.User) error { // 添加用户 err = CommonAddUser(user, groups) if err != nil { - return err + return tools.NewOperationError(fmt.Errorf("添加用户: %s, 失败: %s", user.Username, err.Error())) } } return nil diff --git a/logic/wecom_logic.go b/logic/wecom_logic.go index d9253bd..ec0d3cb 100644 --- a/logic/wecom_logic.go +++ b/logic/wecom_logic.go @@ -74,7 +74,7 @@ func (d WeComLogic) AddDepts(group *model.Group) error { if !isql.Group.Exist(tools.H{"group_dn": group.GroupDN}) { err = CommonAddGroup(group) if err != nil { - return tools.NewOperationError(fmt.Errorf("添加部门失败：%s", err.Error())) + return tools.NewOperationError(fmt.Errorf("添加部门: %s, 失败: %s", group.GroupName, err.Error())) } } return nil @@ -173,7 +173,7 @@ func (d WeComLogic) AddUsers(user *model.User) error { // 创建用户 err = CommonAddUser(user, groups) if err != nil { - return err + return tools.NewOperationError(fmt.Errorf("添加用户: %s, 失败: %s", user.Username, err.Error())) } } return nil