From 2604a90518cee65ff35516dd95f1f08a96e5d08a Mon Sep 17 00:00:00 2001 From: "Crystal.Sea" Date: Tue, 7 Sep 2021 10:15:24 +0800 Subject: [PATCH] SAML ID Service Fix SAML ID Service Fix --- .../maxkey/authz/saml/service/IDService.java | 2 +- .../resources/application-https.properties | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/IDService.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/IDService.java index a9fef182d..a0050f557 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/IDService.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/IDService.java @@ -23,6 +23,6 @@ import java.util.UUID; public class IDService { public String generateID() { - return UUID.randomUUID().toString(); + return "MXK_" + UUID.randomUUID().toString(); } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties index 8f2707a9b..84252ded7 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties @@ -118,26 +118,26 @@ mybatis.table-column-case=lowercase ############################################################################ #redis server configuration # ############################################################################ -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=password -#spring.redis.timeout=10000 -#spring.redis.jedis.pool.max-wait=1000 -#spring.redis.jedis.pool.max-idle=200 -#spring.redis.lettuce.pool.max-active=-1 -#spring.redis.lettuce.pool.min-idle=0 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=password +spring.redis.timeout=10000 +spring.redis.jedis.pool.max-wait=1000 +spring.redis.jedis.pool.max-idle=200 +spring.redis.lettuce.pool.max-active=-1 +spring.redis.lettuce.pool.min-idle=0 ############################################################################ #mail configuration # ############################################################################ -#spring.mail.default-encoding=utf-8 -#spring.mail.host=smtp.163.com -#spring.mail.port=465 -#spring.mail.username=maxkey@163.com -#spring.mail.password=password -#spring.mail.protocol=smtp -#spring.mail.properties.ssl=true -#spring.mail.properties.sender=maxkey@163.com +spring.mail.default-encoding=utf-8 +spring.mail.host=smtp.163.com +spring.mail.port=465 +spring.mail.username=maxkey@163.com +spring.mail.password=password +spring.mail.protocol=smtp +spring.mail.properties.ssl=true +spring.mail.properties.sender=maxkey@163.com spring.mail.properties.mailotp.message.subject=MaxKey One Time PassWord spring.mail.properties.mailotp.message.template={0} You Token is {1} , it validity in {2} minutes. spring.mail.properties.mailotp.message.type=html -- GitLab