diff --git a/README.md b/README.md index b09a342..216d13c 100644 --- a/README.md +++ b/README.md @@ -27,28 +27,6 @@ -## 缘起 - -我曾经经历的公司强依赖openLDAP来作为企业内部员工管理的平台，并通过openLDAP进行各平台的认证打通工作。 - -但成也萧何败也萧何，给运维省力的同时，ldap又是维护不够友好的。 - -在[godap](https://github.com/bradleypeabody/godap)项目中，作者这样描述对ldap的感受： - -> The short version of the story goes like this: I hate LDAP. I used to love it. But I loved it for all the wrong reasons. LDAP is supported as an authentication solution by many different pieces of software. Aside from its de jure standard status, its wide deployment cements it as a de facto standard as well. -> -> However, just because it is a standard doesn't mean it is a great idea. -> -> I'll admit that given its age LDAP has had a good run. I'm sure its authors carefully considered how to construct the protocol and chose ASN.1 and its encoding with all of wellest of well meaning intentions. -> -> The trouble is that with today's Internet, LDAP is just a pain in the ass. You can't call it from your browser. It's not human readable or easy to debug. Tooling is often arcane and confusing. It's way more complicated than what is needed for most simple authentication-only uses. (Yes, I know there are many other uses than authentication - but it's often too complicated for those too.) -> -> Likely owing to the complexity of the protocol, there seems to be virtually no easy to use library to implement the server side of the LDAP protocol that isn't tied in with some complete directory server system; and certainly not in a language as easy to "make it work" as Go. - -他说他对ldap又爱又恨，因为ldap出现的最早，许多的三方软件都兼容支持它，它成了这方面的一个标准。但问题在于，它对于维护者而言，又是复杂麻烦的。就算是有Phpldapadmin这样的平台能够在浏览器维护，但看到那样上古的界面，以及复杂的交互逻辑，仍旧能够把不少人劝退。 - -鉴于此，我开发了这个现代化的openLDAP管理后台。 - ## 在线体验 > admin / 123456 @@ -59,8 +37,8 @@ | 分类 | GitHub | Gitee | | :--: | :--------------------------------------------------: | :-------------------------------------------------: | -| 后端 | https://github.com/eryajf-world/go-ldap-admin.git | https://gitee.com/eryajf-world/go-ldap-admin.git | -| 前端 | https://github.com/eryajf-world/go-ldap-admin-ui.git | https://gitee.com/eryajf-world/go-ldap-admin-ui.git | +| 后端 | https://github.com/eryajf/go-ldap-admin.git | https://gitee.com/eryajf-world/go-ldap-admin.git | +| 前端 | https://github.com/eryajf/go-ldap-admin-ui.git | https://gitee.com/eryajf-world/go-ldap-admin-ui.git | ## 核心功能 @@ -91,7 +69,7 @@ 拉起之前确认是否有与本地端口冲突的情况。 ``` -$ git clone https://github.com/eryajf-world/go-ldap-admin.git +$ git clone https://github.com/eryajf/go-ldap-admin.git $ cd docs/docker-compose @@ -130,10 +108,10 @@ $ docker-compose up -d ``` # 后端代码 -$ git clone https://github.com/eryajf-world/go-ldap-admin.git +$ git clone https://github.com/eryajf/go-ldap-admin.git # 前端代码 -$ git clone https://github.com/eryajf-world/go-ldap-admin-ui.git +$ git clone https://github.com/eryajf/go-ldap-admin-ui.git ``` 后端目录结构： @@ -234,4 +212,26 @@ server { ![](http://t.eryajf.net/imgs/2022/05/4da1e4fe7f712323.jpeg) -如果二维码过期，可通过搜索 eryajf 添加我的微信，备注 ldap 拉你进群。 \ No newline at end of file +如果二维码过期，可通过搜索 eryajf 添加我的微信，备注 ldap 拉你进群。 + +## 为什么有这个项目 + +我曾经经历的公司强依赖openLDAP来作为企业内部员工管理的平台，并通过openLDAP进行各平台的认证打通工作。 + +但成也萧何败也萧何，给运维省力的同时，ldap又是维护不够友好的。 + +在[godap](https://github.com/bradleypeabody/godap)项目中，作者这样描述对ldap的感受： + +> The short version of the story goes like this: I hate LDAP. I used to love it. But I loved it for all the wrong reasons. LDAP is supported as an authentication solution by many different pieces of software. Aside from its de jure standard status, its wide deployment cements it as a de facto standard as well. +> +> However, just because it is a standard doesn't mean it is a great idea. +> +> I'll admit that given its age LDAP has had a good run. I'm sure its authors carefully considered how to construct the protocol and chose ASN.1 and its encoding with all of wellest of well meaning intentions. +> +> The trouble is that with today's Internet, LDAP is just a pain in the ass. You can't call it from your browser. It's not human readable or easy to debug. Tooling is often arcane and confusing. It's way more complicated than what is needed for most simple authentication-only uses. (Yes, I know there are many other uses than authentication - but it's often too complicated for those too.) +> +> Likely owing to the complexity of the protocol, there seems to be virtually no easy to use library to implement the server side of the LDAP protocol that isn't tied in with some complete directory server system; and certainly not in a language as easy to "make it work" as Go. + +他说他对ldap又爱又恨，因为ldap出现的最早，许多的三方软件都兼容支持它，它成了这方面的一个标准。但问题在于，它对于维护者而言，又是复杂麻烦的。就算是有Phpldapadmin这样的平台能够在浏览器维护，但看到那样上古的界面，以及复杂的交互逻辑，仍旧能够把不少人劝退。 + +鉴于此，我开发了这个现代化的openLDAP管理后台。 \ No newline at end of file diff --git a/config.yml b/config.yml index 0ff7363..9c8cb12 100644 --- a/config.yml +++ b/config.yml @@ -9,9 +9,9 @@ system: # 是否初始化数据(没有初始数据时使用, 已发布正式版改为false) init-data: true # rsa公钥文件路径(config.yml相对路径, 也可以填绝对路径) - rsa-public-key: go-web-mini-pub.pem + rsa-public-key: go-ldap-admin-pub.pem # rsa私钥文件路径(config.yml相对路径, 也可以填绝对路径) - rsa-private-key: go-web-mini-priv.pem + rsa-private-key: go-ldap-admin-priv.pem logs: # 日志等级(-1:Debug, 0:Info, 1:Warn, 2:Error, 3:DPanic, 4:Panic, 5:Fatal, -1<=level<=5, 参照zap.level源码) diff --git a/controller/a_controller.go b/controller/a_controller.go index 9d37fa9..e007093 100644 --- a/controller/a_controller.go +++ b/controller/a_controller.go @@ -6,8 +6,8 @@ import ( "net/http" "regexp" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/public/tools" "github.com/gin-gonic/gin" "github.com/go-playground/locales/zh" diff --git a/controller/api_controller.go b/controller/api_controller.go index bcff2c3..294f632 100644 --- a/controller/api_controller.go +++ b/controller/api_controller.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/eryajf-world/go-ldap-admin/logic" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/logic" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/controller/base_controller.go b/controller/base_controller.go index f3f8fb3..038b4ab 100644 --- a/controller/base_controller.go +++ b/controller/base_controller.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/eryajf-world/go-ldap-admin/logic" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/logic" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/controller/group_controller.go b/controller/group_controller.go index 126a2f9..983ccd9 100644 --- a/controller/group_controller.go +++ b/controller/group_controller.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/eryajf-world/go-ldap-admin/logic" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/logic" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/controller/menu_controller.go b/controller/menu_controller.go index bceb2bb..356a3c0 100644 --- a/controller/menu_controller.go +++ b/controller/menu_controller.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/eryajf-world/go-ldap-admin/logic" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/logic" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/controller/operation_log_controller.go b/controller/operation_log_controller.go index bd1f78c..5fd0709 100644 --- a/controller/operation_log_controller.go +++ b/controller/operation_log_controller.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/eryajf-world/go-ldap-admin/logic" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/logic" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/controller/role_controller.go b/controller/role_controller.go index 396933b..ab5ed79 100644 --- a/controller/role_controller.go +++ b/controller/role_controller.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/eryajf-world/go-ldap-admin/logic" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/logic" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/controller/user_controller.go b/controller/user_controller.go index 6a4a5b0..9315f47 100644 --- a/controller/user_controller.go +++ b/controller/user_controller.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/eryajf-world/go-ldap-admin/logic" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/logic" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/docs/docker-compose/config/init.ldif b/docs/docker-compose/config/init.ldif index fd52442..ff2c9fb 100644 --- a/docs/docker-compose/config/init.ldif +++ b/docs/docker-compose/config/init.ldif @@ -1,7 +1,7 @@ -dn: ou=People,dc=eryajf,dc=net +dn: ou=people,dc=eryajf,dc=net objectClass: organizationalUnit ou: people -dn: ou=Group,dc=eryajf,dc=net +dn: ou=group,dc=eryajf,dc=net objectClass: organizationalUnit ou: group \ No newline at end of file diff --git a/docs/docker/config.yml b/docs/docker/config.yml index 42e60e7..f16bd5f 100644 --- a/docs/docker/config.yml +++ b/docs/docker/config.yml @@ -9,9 +9,9 @@ system: # 是否初始化数据(没有初始数据时使用, 已发布正式版改为false) init-data: true # rsa公钥文件路径(config.yml相对路径, 也可以填绝对路径) - rsa-public-key: go-web-mini-pub.pem + rsa-public-key: go-ldap-admin-pub.pem # rsa私钥文件路径(config.yml相对路径, 也可以填绝对路径) - rsa-private-key: go-web-mini-priv.pem + rsa-private-key: go-ldap-admin-priv.pem logs: # 日志等级(-1:Debug, 0:Info, 1:Warn, 2:Error, 3:DPanic, 4:Panic, 5:Fatal, -1<=level<=5, 参照zap.level源码) diff --git a/docs/docker/go-web-mini-priv.pem b/docs/docker/go-ldap-admin-priv.pem similarity index 100% rename from docs/docker/go-web-mini-priv.pem rename to docs/docker/go-ldap-admin-priv.pem diff --git a/docs/docker/go-web-mini-pub.pem b/docs/docker/go-ldap-admin-pub.pem similarity index 100% rename from docs/docker/go-web-mini-pub.pem rename to docs/docker/go-ldap-admin-pub.pem diff --git a/go-web-mini-priv.pem b/go-ldap-admin-priv.pem similarity index 100% rename from go-web-mini-priv.pem rename to go-ldap-admin-priv.pem diff --git a/go-web-mini-pub.pem b/go-ldap-admin-pub.pem similarity index 100% rename from go-web-mini-pub.pem rename to go-ldap-admin-pub.pem diff --git a/go.mod b/go.mod index ee8c350..1d83efe 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/eryajf-world/go-ldap-admin +module github.com/eryajf/go-ldap-admin go 1.17 @@ -24,19 +24,41 @@ require ( ) require ( + github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect + github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect github.com/denisenkom/go-mssqldb v0.9.0 // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect + github.com/go-sql-driver/mysql v1.5.0 // indirect + github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect github.com/golang/protobuf v1.4.3 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.8.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgproto3/v2 v2.0.7 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.6.2 // indirect + github.com/jackc/pgx/v4 v4.10.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.1 // indirect github.com/json-iterator/go v1.1.10 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/magiconair/properties v1.8.4 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/pelletier/go-toml v1.8.1 // indirect github.com/spf13/afero v1.5.1 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/ugorji/go v1.2.3 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/ugorji/go/codec v1.2.3 // indirect + go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect diff --git a/logic/a_logic.go b/logic/a_logic.go index 5488a39..24802eb 100644 --- a/logic/a_logic.go +++ b/logic/a_logic.go @@ -3,7 +3,7 @@ package logic import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/public/tools" ) var ( diff --git a/logic/api_logic.go b/logic/api_logic.go index 2f60f3c..b88f302 100644 --- a/logic/api_logic.go +++ b/logic/api_logic.go @@ -3,11 +3,11 @@ package logic import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" - "github.com/eryajf-world/go-ldap-admin/svc/request" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/svc/response" "github.com/gin-gonic/gin" "github.com/thoas/go-funk" diff --git a/logic/base_logic.go b/logic/base_logic.go index f55ac8e..dfc6d68 100644 --- a/logic/base_logic.go +++ b/logic/base_logic.go @@ -3,12 +3,12 @@ package logic import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/ildap" - "github.com/eryajf-world/go-ldap-admin/service/isql" - "github.com/eryajf-world/go-ldap-admin/svc/request" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/ildap" + "github.com/eryajf/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/svc/response" "github.com/gin-gonic/gin" ) diff --git a/logic/group_logic.go b/logic/group_logic.go index 4a96563..1b671c5 100644 --- a/logic/group_logic.go +++ b/logic/group_logic.go @@ -2,15 +2,16 @@ package logic import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/config" "strings" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/ildap" - "github.com/eryajf-world/go-ldap-admin/service/isql" - "github.com/eryajf-world/go-ldap-admin/svc/request" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/config" + + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/ildap" + "github.com/eryajf/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/svc/response" "github.com/gin-gonic/gin" ) diff --git a/logic/menu_logic.go b/logic/menu_logic.go index 0711af5..9662027 100644 --- a/logic/menu_logic.go +++ b/logic/menu_logic.go @@ -3,10 +3,10 @@ package logic import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" ) diff --git a/logic/operation_log_logic.go b/logic/operation_log_logic.go index 9914290..7df3973 100644 --- a/logic/operation_log_logic.go +++ b/logic/operation_log_logic.go @@ -3,11 +3,11 @@ package logic import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" - "github.com/eryajf-world/go-ldap-admin/svc/request" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/svc/response" "github.com/gin-gonic/gin" ) diff --git a/logic/role_logic.go b/logic/role_logic.go index 0699361..f6e8ed9 100644 --- a/logic/role_logic.go +++ b/logic/role_logic.go @@ -3,12 +3,12 @@ package logic import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" - "github.com/eryajf-world/go-ldap-admin/svc/request" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/svc/response" "github.com/gin-gonic/gin" "github.com/thoas/go-funk" diff --git a/logic/user_logic.go b/logic/user_logic.go index 5efb018..9b93a9c 100644 --- a/logic/user_logic.go +++ b/logic/user_logic.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/ildap" - "github.com/eryajf-world/go-ldap-admin/service/isql" - "github.com/eryajf-world/go-ldap-admin/svc/request" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/ildap" + "github.com/eryajf/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/svc/response" "github.com/gin-gonic/gin" "github.com/thoas/go-funk" diff --git a/main.go b/main.go index 6224f28..8e2e9c7 100644 --- a/main.go +++ b/main.go @@ -9,11 +9,11 @@ import ( "syscall" "time" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/middleware" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/routes" - "github.com/eryajf-world/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/routes" + "github.com/eryajf/go-ldap-admin/service/isql" ) func main() { diff --git a/middleware/AuthMiddleware.go b/middleware/AuthMiddleware.go index d2e3e71..b63e81f 100644 --- a/middleware/AuthMiddleware.go +++ b/middleware/AuthMiddleware.go @@ -3,16 +3,16 @@ package middleware import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" "time" - "github.com/eryajf-world/go-ldap-admin/svc/request" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/svc/response" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/middleware/CasbinMiddleware.go b/middleware/CasbinMiddleware.go index 41d9b4d..8cc4f20 100644 --- a/middleware/CasbinMiddleware.go +++ b/middleware/CasbinMiddleware.go @@ -4,10 +4,10 @@ import ( "strings" "sync" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" "github.com/gin-gonic/gin" ) diff --git a/middleware/OperationLogMiddleware.go b/middleware/OperationLogMiddleware.go index 410a1b4..a54a3e5 100644 --- a/middleware/OperationLogMiddleware.go +++ b/middleware/OperationLogMiddleware.go @@ -4,10 +4,10 @@ import ( "strings" "time" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" "github.com/gin-gonic/gin" ) diff --git a/middleware/RateLimitMiddleware.go b/middleware/RateLimitMiddleware.go index 80f4938..c5bee72 100644 --- a/middleware/RateLimitMiddleware.go +++ b/middleware/RateLimitMiddleware.go @@ -3,7 +3,7 @@ package middleware import ( "time" - "github.com/eryajf-world/go-ldap-admin/svc/response" + "github.com/eryajf/go-ldap-admin/svc/response" "github.com/gin-gonic/gin" "github.com/juju/ratelimit" diff --git a/public/common/casbin.go b/public/common/casbin.go index 0d2d9ff..f10c4d6 100644 --- a/public/common/casbin.go +++ b/public/common/casbin.go @@ -3,7 +3,7 @@ package common import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/config" "github.com/casbin/casbin/v2" gormadapter "github.com/casbin/gorm-adapter/v3" diff --git a/public/common/database.go b/public/common/database.go index 61185d2..120d7cb 100644 --- a/public/common/database.go +++ b/public/common/database.go @@ -3,8 +3,8 @@ package common import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/model" "gorm.io/driver/mysql" "gorm.io/gorm" diff --git a/public/common/init_mysql_data.go b/public/common/init_mysql_data.go index 3bdf046..b22b560 100644 --- a/public/common/init_mysql_data.go +++ b/public/common/init_mysql_data.go @@ -3,9 +3,9 @@ package common import ( "errors" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/tools" "github.com/thoas/go-funk" "gorm.io/gorm" diff --git a/public/common/ldap.go b/public/common/ldap.go index ff5d938..6a2ec71 100644 --- a/public/common/ldap.go +++ b/public/common/ldap.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/eryajf-world/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/config" ldap "github.com/go-ldap/ldap/v3" ) diff --git a/public/common/logger.go b/public/common/logger.go index 8ebf22b..c4c6a80 100644 --- a/public/common/logger.go +++ b/public/common/logger.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/eryajf-world/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/config" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/public/tools/bcrypt_passwd.go b/public/tools/bcrypt_passwd.go index b375329..8d5aa40 100644 --- a/public/tools/bcrypt_passwd.go +++ b/public/tools/bcrypt_passwd.go @@ -1,7 +1,7 @@ package tools import ( - "github.com/eryajf-world/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/config" ) // 密码加密 使用自适应hash算法, 不可逆 diff --git a/public/tools/email.go b/public/tools/email.go index de0c34a..b76532d 100644 --- a/public/tools/email.go +++ b/public/tools/email.go @@ -3,7 +3,7 @@ package tools import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/config" "strconv" diff --git a/routes/a_routes.go b/routes/a_routes.go index 4424d02..3c2c933 100644 --- a/routes/a_routes.go +++ b/routes/a_routes.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/middleware" - "github.com/eryajf-world/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/public/common" "github.com/gin-gonic/gin" ) diff --git a/routes/api_routes.go b/routes/api_routes.go index de361aa..748a86a 100644 --- a/routes/api_routes.go +++ b/routes/api_routes.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/eryajf-world/go-ldap-admin/controller" - "github.com/eryajf-world/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/controller" + "github.com/eryajf/go-ldap-admin/middleware" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/routes/base_routes.go b/routes/base_routes.go index 61631a0..3338d00 100644 --- a/routes/base_routes.go +++ b/routes/base_routes.go @@ -1,7 +1,7 @@ package routes import ( - "github.com/eryajf-world/go-ldap-admin/controller" + "github.com/eryajf/go-ldap-admin/controller" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/routes/group_routes.go b/routes/group_routes.go index b9a0322..fa8613c 100644 --- a/routes/group_routes.go +++ b/routes/group_routes.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/eryajf-world/go-ldap-admin/controller" - "github.com/eryajf-world/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/controller" + "github.com/eryajf/go-ldap-admin/middleware" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/routes/menu_routes.go b/routes/menu_routes.go index 600038e..3101c24 100644 --- a/routes/menu_routes.go +++ b/routes/menu_routes.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/eryajf-world/go-ldap-admin/controller" - "github.com/eryajf-world/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/controller" + "github.com/eryajf/go-ldap-admin/middleware" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/routes/operation_log_routes.go b/routes/operation_log_routes.go index b69ce8e..372e543 100644 --- a/routes/operation_log_routes.go +++ b/routes/operation_log_routes.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/eryajf-world/go-ldap-admin/controller" - "github.com/eryajf-world/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/controller" + "github.com/eryajf/go-ldap-admin/middleware" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/routes/role_routes.go b/routes/role_routes.go index b8b5b23..1a108e1 100644 --- a/routes/role_routes.go +++ b/routes/role_routes.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/eryajf-world/go-ldap-admin/controller" - "github.com/eryajf-world/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/controller" + "github.com/eryajf/go-ldap-admin/middleware" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/routes/user_routes.go b/routes/user_routes.go index cfa905b..18ead95 100644 --- a/routes/user_routes.go +++ b/routes/user_routes.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/eryajf-world/go-ldap-admin/controller" - "github.com/eryajf-world/go-ldap-admin/middleware" + "github.com/eryajf/go-ldap-admin/controller" + "github.com/eryajf/go-ldap-admin/middleware" jwt "github.com/appleboy/gin-jwt/v2" "github.com/gin-gonic/gin" diff --git a/service/ildap/group_ildap.go b/service/ildap/group_ildap.go index 4f17844..ce7305f 100644 --- a/service/ildap/group_ildap.go +++ b/service/ildap/group_ildap.go @@ -3,9 +3,10 @@ package ildap import ( "errors" "fmt" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" + + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" ldap "github.com/go-ldap/ldap/v3" ) diff --git a/service/ildap/user_ildap.go b/service/ildap/user_ildap.go index 360f590..9fcf742 100644 --- a/service/ildap/user_ildap.go +++ b/service/ildap/user_ildap.go @@ -3,9 +3,9 @@ package ildap import ( "fmt" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" ldap "github.com/go-ldap/ldap/v3" ) diff --git a/service/isql/api_isql.go b/service/isql/api_isql.go index ad56fb9..516426e 100644 --- a/service/isql/api_isql.go +++ b/service/isql/api_isql.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/svc/request" "gorm.io/gorm" ) diff --git a/service/isql/group_isql.go b/service/isql/group_isql.go index 401f76d..dc0eda7 100644 --- a/service/isql/group_isql.go +++ b/service/isql/group_isql.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/svc/request" "gorm.io/gorm" ) diff --git a/service/isql/menu_isql.go b/service/isql/menu_isql.go index fc1504f..e20a29b 100644 --- a/service/isql/menu_isql.go +++ b/service/isql/menu_isql.go @@ -3,8 +3,8 @@ package isql import ( "errors" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" "github.com/thoas/go-funk" "gorm.io/gorm" diff --git a/service/isql/operation_log_isql.go b/service/isql/operation_log_isql.go index 9a08116..d3405d8 100644 --- a/service/isql/operation_log_isql.go +++ b/service/isql/operation_log_isql.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/svc/request" "gorm.io/gorm" ) diff --git a/service/isql/role_isql.go b/service/isql/role_isql.go index 7c906b3..10a1f7e 100644 --- a/service/isql/role_isql.go +++ b/service/isql/role_isql.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/svc/request" "gorm.io/gorm" ) diff --git a/service/isql/user_isql.go b/service/isql/user_isql.go index b2f52fb..0e8a91f 100644 --- a/service/isql/user_isql.go +++ b/service/isql/user_isql.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/eryajf-world/go-ldap-admin/model" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/svc/request" + "github.com/eryajf/go-ldap-admin/model" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/svc/request" "github.com/gin-gonic/gin" "github.com/patrickmn/go-cache" diff --git a/svc/response/api_rsp.go b/svc/response/api_rsp.go index 281307e..9d4e6ca 100644 --- a/svc/response/api_rsp.go +++ b/svc/response/api_rsp.go @@ -1,6 +1,6 @@ package response -import "github.com/eryajf-world/go-ldap-admin/model" +import "github.com/eryajf/go-ldap-admin/model" type ApiTreeRsp struct { ID int `json:"ID"` diff --git a/svc/response/group_rsp.go b/svc/response/group_rsp.go index 53250fd..89ce277 100644 --- a/svc/response/group_rsp.go +++ b/svc/response/group_rsp.go @@ -1,6 +1,6 @@ package response -import "github.com/eryajf-world/go-ldap-admin/model" +import "github.com/eryajf/go-ldap-admin/model" type GroupListRsp struct { Total int64 `json:"total"` diff --git a/svc/response/menu_rsp.go b/svc/response/menu_rsp.go index 33dd208..22cbe05 100644 --- a/svc/response/menu_rsp.go +++ b/svc/response/menu_rsp.go @@ -1,6 +1,6 @@ package response -import "github.com/eryajf-world/go-ldap-admin/model" +import "github.com/eryajf/go-ldap-admin/model" type MenuListRsp struct { Total int64 `json:"total"` diff --git a/svc/response/operation_log_rsp.go b/svc/response/operation_log_rsp.go index 64927b0..958b0b7 100644 --- a/svc/response/operation_log_rsp.go +++ b/svc/response/operation_log_rsp.go @@ -1,6 +1,6 @@ package response -import "github.com/eryajf-world/go-ldap-admin/model" +import "github.com/eryajf/go-ldap-admin/model" type LogListRsp struct { Total int64 `json:"total"` diff --git a/svc/response/role_rsp.go b/svc/response/role_rsp.go index 39dcb43..0644aef 100644 --- a/svc/response/role_rsp.go +++ b/svc/response/role_rsp.go @@ -1,6 +1,6 @@ package response -import "github.com/eryajf-world/go-ldap-admin/model" +import "github.com/eryajf/go-ldap-admin/model" type RoleListRsp struct { Total int64 `json:"total"` diff --git a/svc/response/user_rsp.go b/svc/response/user_rsp.go index f13871c..c31b6b7 100644 --- a/svc/response/user_rsp.go +++ b/svc/response/user_rsp.go @@ -1,6 +1,6 @@ package response -import "github.com/eryajf-world/go-ldap-admin/model" +import "github.com/eryajf/go-ldap-admin/model" type UserListRsp struct { Total int `json:"total"` diff --git a/test/go-ldap-admin-priv.pem b/test/go-ldap-admin-priv.pem new file mode 120000 index 0000000..bb7042f --- /dev/null +++ b/test/go-ldap-admin-priv.pem @@ -0,0 +1 @@ +../go-ldap-admin-priv.pem \ No newline at end of file diff --git a/test/go-ldap-admin-pub.pem b/test/go-ldap-admin-pub.pem new file mode 120000 index 0000000..712a71b --- /dev/null +++ b/test/go-ldap-admin-pub.pem @@ -0,0 +1 @@ +../go-ldap-admin-pub.pem \ No newline at end of file diff --git a/test/go-web-mini-priv.pem b/test/go-web-mini-priv.pem deleted file mode 120000 index ba14672..0000000 --- a/test/go-web-mini-priv.pem +++ /dev/null @@ -1 +0,0 @@ -../go-web-mini-priv.pem \ No newline at end of file diff --git a/test/go-web-mini-pub.pem b/test/go-web-mini-pub.pem deleted file mode 120000 index 8a3460e..0000000 --- a/test/go-web-mini-pub.pem +++ /dev/null @@ -1 +0,0 @@ -../go-web-mini-pub.pem \ No newline at end of file diff --git a/test/isql_test.go b/test/isql_test.go index 531f81b..67cafd9 100644 --- a/test/isql_test.go +++ b/test/isql_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/public/common" - "github.com/eryajf-world/go-ldap-admin/public/tools" - "github.com/eryajf-world/go-ldap-admin/service/isql" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/public/common" + "github.com/eryajf/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/service/isql" ) func InitConfig() { diff --git a/test/tools_test.go b/test/tools_test.go index 38933da..92d52a2 100644 --- a/test/tools_test.go +++ b/test/tools_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/eryajf-world/go-ldap-admin/config" - "github.com/eryajf-world/go-ldap-admin/public/tools" + "github.com/eryajf/go-ldap-admin/config" + "github.com/eryajf/go-ldap-admin/public/tools" ) func TestUnGenPassword(t *testing.T) {