Merge branch 'dev-ldap'

behappy-project · Apr 25, 2023 · 74ed4c4 · 74ed4c4
2 parents 751fb50 + 35802ef
commit 74ed4c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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}