From 57b98102660cafb8b5fca4daf443df77be7a7f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Tue, 14 Jun 2022 13:07:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ldap=E5=88=9D=E5=A7=8B=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE,=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=88=86=E7=BB=84=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=20(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docker-compose/config/init.ldif | 42 +++++++--------------------- public/common/init_mysql_data.go | 18 ++++++------ 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/docs/docker-compose/config/init.ldif b/docs/docker-compose/config/init.ldif index bfb50b5..c23735e 100644 --- a/docs/docker-compose/config/init.ldif +++ b/docs/docker-compose/config/init.ldif @@ -3,42 +3,20 @@ ou: people description: 用户根目录 objectClass: organizationalUnit -dn: ou=eryajf,dc=eryajf,dc=net -ou: eryajf -description: 二丫讲梵有限公司 +dn: ou=dingtalkroot,dc=eryajf,dc=net +ou: dingtalkroot +description: 钉钉根部门 objectClass: top objectClass: organizationalUnit -dn: ou=jenkins,dc=eryajf,dc=net -ou: jenkins -description: Jenkins对应权限组管理 +dn: ou=wecomroot,dc=eryajf,dc=net +ou: wecomroot +description: 企业微信根部门 objectClass: top objectClass: organizationalUnit -dn: cn=ceshizu,ou=eryajf,dc=eryajf,dc=net -cn: ceshizu -description: 测试组 +dn: ou=feishuroot,dc=eryajf,dc=net +ou: feishu +description: 飞书根部门 objectClass: top -objectClass: groupOfUniqueNames -uniquemember: cn=admin,dc=eryajf,dc=net - -dn: cn=yunweizu,ou=eryajf,dc=eryajf,dc=net -cn: yunweizu -description: 运维组 -objectClass: top -objectClass: groupOfUniqueNames -uniquemember: cn=admin,dc=eryajf,dc=net - -dn: cn=test-admin,ou=jenkins,dc=eryajf,dc=net -cn: test-admin -description: admin测试环境 -objectClass: top -objectClass: groupOfUniqueNames -uniquemember: cn=admin,dc=eryajf,dc=net - -dn: cn=prod-admin,ou=jenkins,dc=eryajf,dc=net -cn: prod-admin -description: admin正式环境 -objectClass: top -objectClass: groupOfUniqueNames -uniquemember: cn=admin,dc=eryajf,dc=net \ No newline at end of file +objectClass: organizationalUnit \ No newline at end of file diff --git a/public/common/init_mysql_data.go b/public/common/init_mysql_data.go index 3aa0165..348defd 100644 --- a/public/common/init_mysql_data.go +++ b/public/common/init_mysql_data.go @@ -638,22 +638,22 @@ func InitData() { Creator: "system", GroupType: "ou", ParentId: 0, - SourceDeptId: "wechatwork_1", - Source: "wechatwork", - SourceDeptParentId: "wechatwork_0", - GroupDN: fmt.Sprintf("ou=%s,%s", "wechatworkroot", config.Conf.Ldap.BaseDN), + SourceDeptId: fmt.Sprintf("%s_%d", config.Conf.WeCom.Flag, 1), + Source: config.Conf.WeCom.Flag, + SourceDeptParentId: fmt.Sprintf("%s_%d", config.Conf.WeCom.Flag, 0), + GroupDN: fmt.Sprintf("ou=%s,%s", config.Conf.WeCom.Flag+"root", config.Conf.Ldap.BaseDN), }, { Model: gorm.Model{ID: 3}, - GroupName: "feishuroot", + GroupName: config.Conf.FeiShu.Flag + "root", Remark: "飞书根部门", Creator: "system", GroupType: "ou", ParentId: 0, - SourceDeptId: "feishu_1", - Source: "feishu", - SourceDeptParentId: "feishu_0", - GroupDN: fmt.Sprintf("ou=%s,%s", "feishuroot", config.Conf.Ldap.BaseDN), + SourceDeptId: fmt.Sprintf("%s_%d", config.Conf.FeiShu.Flag, 1), + Source: config.Conf.FeiShu.Flag, + SourceDeptParentId: fmt.Sprintf("%s_%d", config.Conf.FeiShu.Flag, 0), + GroupDN: fmt.Sprintf("ou=%s,%s", config.Conf.FeiShu.Flag+"root", config.Conf.Ldap.BaseDN), }, // { // Model: gorm.Model{ID: 2},