Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/ldap-admin/internal/handler/addldaporganizationmemberhandler.go

@@ -15,7 +15,7 @@ func AddLdapOrganizationMemberHandler(svcCtx *svc.ServiceContext) http.HandlerFu
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.AddLdapOrganizationMemberReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func AddLdapOrganizationMemberHandler(svcCtx *svc.ServiceContext) http.HandlerFu
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.AddLdapOrganizationMember(&req, userinfo)
+		resp := l.AddLdapOrganizationMember(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/createldaporganizationhandler.go

@@ -15,7 +15,7 @@ func CreateLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.CreateLdapOrganizationReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func CreateLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.CreateLdapOrganization(&req, userinfo)
+		resp := l.CreateLdapOrganization(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/createldapuserbasegrouphandler.go

@@ -15,7 +15,7 @@ func CreateLdapUserBaseGroupHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.Request
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func CreateLdapUserBaseGroupHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.CreateLdapUserBaseGroup(&req, userinfo)
+		resp := l.CreateLdapUserBaseGroup(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/createldapuserhandler.go

@@ -15,7 +15,7 @@ func CreateLdapUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.CreateLdapUserReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func CreateLdapUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.CreateLdapUser(&req, userinfo)
+		resp := l.CreateLdapUser(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/deleteldaporganizationhandler.go

@@ -15,7 +15,7 @@ func DeleteLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.DeleteLdapOrganizationReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func DeleteLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.DeleteLdapOrganization(&req, userinfo)
+		resp := l.DeleteLdapOrganization(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/deleteldapuserhandler.go

@@ -15,7 +15,7 @@ func DeleteLdapUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.DeleteLdapUserReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func DeleteLdapUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.DeleteLdapUser(&req, userinfo)
+		resp := l.DeleteLdapUser(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/getldaporganizationmembershandler.go

@@ -15,7 +15,7 @@ func GetLdapOrganizationMembersHandler(svcCtx *svc.ServiceContext) http.HandlerF
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.GetLdapOrganizationMembersReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func GetLdapOrganizationMembersHandler(svcCtx *svc.ServiceContext) http.HandlerF
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.GetLdapOrganizationMembers(&req, userinfo)
+		resp := l.GetLdapOrganizationMembers(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/getldaporganizationshandler.go

@@ -15,7 +15,7 @@ func GetLdapOrganizationsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.Request
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func GetLdapOrganizationsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.GetLdapOrganizations(&req, userinfo)
+		resp := l.GetLdapOrganizations(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/getldapuserinfohandler.go

@@ -15,7 +15,7 @@ func GetLdapUserInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.GetLdapUserInfoReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func GetLdapUserInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.GetLdapUserInfo(&req, userinfo)
+		resp := l.GetLdapUserInfo(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/getldapusershandler.go

@@ -15,7 +15,7 @@ func GetLdapUsersHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.GetLdapUsersReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func GetLdapUsersHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.GetLdapUsers(&req, userinfo)
+		resp := l.GetLdapUsers(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/ldapuserloginhandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/ldap-admin/internal/logic"
+	"fusenapi/server/ldap-admin/internal/svc"
+	"fusenapi/server/ldap-admin/internal/types"
+)
+
+func LdapUserLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.LdapUserLoginReq
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewLdapUserLoginLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.LdapUserLogin(&req)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/ldap-admin/internal/handler/removeldaporganizationmemberhandler.go

@@ -15,7 +15,7 @@ func RemoveLdapOrganizationMemberHandler(svcCtx *svc.ServiceContext) http.Handle
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.RemoveLdapOrganizationMemberReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func RemoveLdapOrganizationMemberHandler(svcCtx *svc.ServiceContext) http.Handle
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.RemoveLdapOrganizationMember(&req, userinfo)
+		resp := l.RemoveLdapOrganizationMember(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/routes.go

@@ -147,6 +147,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/ldap-admin/get_ldap_users",
 				Handler: GetLdapUsersHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/ldap-admin/ldap_user_login",
+				Handler: LdapUserLoginHandler(serverCtx),
+			},
 		},
 	)
 }

server/ldap-admin/internal/handler/updateldaporganizationhandler.go

@@ -15,7 +15,7 @@ func UpdateLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.UpdateLdapOrganizationReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func UpdateLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.UpdateLdapOrganization(&req, userinfo)
+		resp := l.UpdateLdapOrganization(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/updateldapuserhandler.go

@@ -15,7 +15,7 @@ func UpdateLdapUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.UpdateLdapUserReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func UpdateLdapUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.UpdateLdapUser(&req, userinfo)
+		resp := l.UpdateLdapUser(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)

server/ldap-admin/internal/handler/updateldapuserpwdhandler.go

@@ -15,7 +15,7 @@ func UpdateLdapUserPwdHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.UpdateLdapUserPwdReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		_, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
 		}
@@ -26,7 +26,7 @@ func UpdateLdapUserPwdHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)
 
-		resp := l.UpdateLdapUserPwd(&req, userinfo)
+		resp := l.UpdateLdapUserPwd(&req, r)
 
 		if !basic.AfterLogic(w, r, rl, resp) {
 			basic.NormalAfterLogic(w, r, resp)