From 8f4848472575333793a65464db857a9e410a3c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
<806783409@qq.com>
Date: Tue, 7 Mar 2023 17:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=9C=AA=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E7=9A=84LDAP=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF?=
=?UTF-8?q?=E6=8C=81MySQL8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 14 ++------------
zyplayer-doc-db/pom.xml | 4 ----
zyplayer-doc-manage/pom.xml | 4 ----
.../zyplayer/doc/manage/web/LoginController.java | 14 +-------------
.../doc/manage/web/param/LdapPerson.java | 16 ++++------------
.../src/main/resources/application.yml | 9 +--------
6 files changed, 8 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index bcb2bb51..2267ce5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,15 +59,10 @@
spring-boot-starter-jdbc
${spring.boot.version}
-
- org.springframework.boot
- spring-boot-starter-data-ldap
- ${spring.boot.version}
-
mysql
mysql-connector-java
- 5.1.47
+ 8.0.32
net.sourceforge.jtds
@@ -115,11 +110,6 @@
commons-lang3
3.12.0
-
- org.mybatis
- mybatis
- 3.5.7
-
com.alibaba
easyexcel
@@ -128,7 +118,7 @@
com.baomidou
mybatis-plus-boot-starter
- 3.4.3.2
+ 3.5.3.1
com.baomidou
diff --git a/zyplayer-doc-db/pom.xml b/zyplayer-doc-db/pom.xml
index cadd2d65..51c5a99f 100644
--- a/zyplayer-doc-db/pom.xml
+++ b/zyplayer-doc-db/pom.xml
@@ -35,10 +35,6 @@
org.springframework.boot
spring-boot-starter-jdbc
-
- org.mybatis
- mybatis
-
com.zyplayer
zyplayer-doc-core
diff --git a/zyplayer-doc-manage/pom.xml b/zyplayer-doc-manage/pom.xml
index 20df5378..5b7754db 100644
--- a/zyplayer-doc-manage/pom.xml
+++ b/zyplayer-doc-manage/pom.xml
@@ -33,10 +33,6 @@
org.springframework.boot
spring-boot-starter-web
-
- org.springframework.boot
- spring-boot-starter-data-ldap
-
com.zyplayer
zyplayer-doc-core
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java
index d275b9f5..dcb300cf 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java
@@ -14,8 +14,6 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.query.LdapQueryBuilder;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -40,8 +38,6 @@ public class LoginController {
private UserInfoService userInfoService;
@Resource
private UserAuthService userAuthService;
- @Resource
- private LdapTemplate ldapTemplate;
@Value("${spring.ldap.enable:false}")
private boolean ldapLoginEnable;
@@ -119,15 +115,7 @@ public class LoginController {
* 参考项目：https://gitee.com/durcframework/torna，方法：cn.torna.service.login.form.impl.LdapLoginManager#ldapAuth
*/
public LdapPerson getUserFromLdap(String username, String password) {
- try {
- return ldapTemplate.authenticate(
- LdapQueryBuilder.query().where("uid").is(username),
- password,
- (dirContext, ldapEntryIdentification) ->
- ldapTemplate.findOne(LdapQueryBuilder.query().where("uid").is(username), LdapPerson.class));
- } catch (Exception e) {
- logger.error("LDAP登录失败", e);
- }
+ // TODO 暂未实现
return null;
}
}
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java
index 2efc2528..ffce8750 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java
@@ -1,9 +1,6 @@
package com.zyplayer.doc.manage.web.param;
-import lombok.*;
-import org.springframework.ldap.odm.annotations.Attribute;
-import org.springframework.ldap.odm.annotations.DnAttribute;
-import org.springframework.ldap.odm.annotations.Entry;
+import lombok.Data;
/**
* 域账号用户信息
@@ -13,25 +10,20 @@ import org.springframework.ldap.odm.annotations.Entry;
* @since 2021年8月2日
*/
@Data
-@Entry(objectClasses = "inetOrgPerson")
public class LdapPerson {
-
+
/**
* 用户ID
*/
- @DnAttribute(value = "uid")
private String uid;
-
+
/**
* 用户名
*/
- @Attribute(name = "displayName")
private String displayName;
-
+
/**
* 邮箱
*/
- @Attribute(name = "mail")
private String mail;
-
}
diff --git a/zyplayer-doc-manage/src/main/resources/application.yml b/zyplayer-doc-manage/src/main/resources/application.yml
index 6ace3449..51f28e8e 100644
--- a/zyplayer-doc-manage/src/main/resources/application.yml
+++ b/zyplayer-doc-manage/src/main/resources/application.yml
@@ -16,7 +16,7 @@ zyplayer:
originDomainRegex: .*\.zyplayer\.com(:\d+|)$
# 管理端的数据库配置
datasource:
- driverClassName: com.mysql.jdbc.Driver
+ driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/zyplayer_doc_manage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
username: root
password: root
@@ -54,10 +54,3 @@ spring:
max-request-size: 100MB
datasource:
continue-on-error: true
- # 域账号登录，暂未严格测试
- ldap:
- enable: false
- urls: ldap://10.0.1.1:10389
- base: dc=xx,dc=net
- username: cn=Manager,dc=xx,dc=net
- password: MKDSHYDNIS