From 35802ef8202d5abf6c8afbefb7d47e997f5f9e81 Mon Sep 17 00:00:00 2001
From: xiaowu <943915349@qq.com>
Date: Tue, 25 Apr 2023 15:52:39 +0800
Subject: [PATCH] =?UTF-8?q?feature=201.=20=E6=94=AF=E6=8C=81ldap=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=96=B9=E5=BC=8F=202.=20=E6=94=AF=E6=8C=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix
1. 修改用户操作，roleId的错误改动
---
 docker-compose.yml                       | 5 +++++
 screw/src/main/resources/application.yml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5e2bf41..7e62ea6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,11 @@ services:
       # REDIS_HOST: 127.0.0.1
       # REDIS_PORT: 9000
       # REDIS_PASSWORD: redis
+      # LDAP配置，如需要请配置
+      # LDAP_URL: ldap://127.0.0.1:389
+      # LDAP_BASE: dc=extension,dc=net
+      # LDAP_USERNAME: cn=admin,dc=extension,dc=net
+      # LDAP_PASSWORD: 123456
       # 服务本身数据持久化（mysql）
       DATASTORE_BASE: screw_doc
       MYSQL_HOST: 127.0.0.1
diff --git a/screw/src/main/resources/application.yml b/screw/src/main/resources/application.yml
index 0482353..a5c7752 100644
--- a/screw/src/main/resources/application.yml
+++ b/screw/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
     active: @profiles.active@
   ldap:
     urls:
-      - ${LDAP_URLS:ldap://127.0.0.1:389}
+      - ${LDAP_URL:ldap://127.0.0.1:389}
     base: ${LDAP_BASE:dc=extension,dc=net}
     username: ${LDAP_USERNAME:cn=admin,dc=extension,dc=net}
     password: ${LDAP_PASSWORD:123456}