Merge branch 'main' of https://github.com/eryajf/go-ldap-admin

opsre · Jun 14, 2022 · 8677dcd · 8677dcd
2 parents 7d2f389 + 57b9810
commit 8677dcd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 41 deletions.
diff --git 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
+objectClass: organizationalUnit
diff --git 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},