代码优化

优化去掉spring.main.allow-bean-definition-overriding=true
JWT配置文件和代码优化
机构管理新增和修改界面tab切换问题
其他优化和日志完善
This commit is contained in:
Crystal.Sea
2021-10-09 10:18:33 +08:00
parent b7adb8a830
commit 9be6bad1b5
25 changed files with 250 additions and 279 deletions

View File

@@ -69,9 +69,13 @@ maxkey.login.wsfederation =false
maxkey.login.remeberme =${LOGIN_REMEBERME:true}
#validity
maxkey.login.remeberme.validity =0
#JWT support
maxkey.login.jwt =${LOGIN_JWT:true}
maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:https://${maxkey.server.domain}/maxkey}
#to default application web site
maxkey.login.default.uri =appList
maxkey.ipaddress.whitelist =false
#notices show
maxkey.notices.visible =false
############################################################################
@@ -210,45 +214,45 @@ maxkey.otp.policy.period =30
############################################################################
#LDAP Login support configuration #
############################################################################
maxkey.support.ldap.enable =${LDAP_ENABLE:false}
maxkey.support.ldap.jit =false
maxkey.login.ldap.enable =${LDAP_ENABLE:false}
maxkey.login.ldap.jit =false
#openldap,activedirectory,normal
maxkey.support.ldap.product =${LDAP_PRODUCT:openldap}
maxkey.support.ldap.ssl =${LDAP_SSL:false}
maxkey.support.ldap.providerurl =${LDAP_PROVIDERURL:ldap://localhost:389}
maxkey.support.ldap.principal =${LDAP_PRINCIPAL:cn=Manager,dc=maxcrc,dc=com}
maxkey.support.ldap.credentials =${LDAP_CREDENTIALS:secret}
maxkey.support.ldap.basedn =${LDAP_BASEDN:dc=maxcrc,dc=com}
maxkey.support.ldap.filter =(uid=%s)
maxkey.support.ldap.truststore =${LDAP_TRUSTSTORE:maxkey}
maxkey.support.ldap.truststorepassword =${LDAP_TRUSTSTORE_PASSWORD:maxkey}
maxkey.login.ldap.product =${LDAP_PRODUCT:openldap}
maxkey.login.ldap.ssl =${LDAP_SSL:false}
maxkey.login.ldap.providerurl =${LDAP_PROVIDERURL:ldap://localhost:389}
maxkey.login.ldap.principal =${LDAP_PRINCIPAL:cn=Manager,dc=maxcrc,dc=com}
maxkey.login.ldap.credentials =${LDAP_CREDENTIALS:secret}
maxkey.login.ldap.basedn =${LDAP_BASEDN:dc=maxcrc,dc=com}
maxkey.login.ldap.filter =(uid=%s)
maxkey.login.ldap.truststore =${LDAP_TRUSTSTORE:maxkey}
maxkey.login.ldap.truststorepassword =${LDAP_TRUSTSTORE_PASSWORD:maxkey}
#activedirectory effective
maxkey.support.ldap.activedirectory.domain =${LDAP_AD_DOMAIN:MAXKEY.ORG}
maxkey.login.ldap.activedirectory.domain =${LDAP_AD_DOMAIN:MAXKEY.ORG}
############################################################################
#Kerberos Login configuration #
#short name of user domain must be in upper case,eg:MAXKEY #
############################################################################
maxkey.support.kerberos.default.userdomain =MAXKEY
maxkey.login.kerberos.default.userdomain =MAXKEY
#short name of user domain must be in upper case,eg:MAXKEY.ORG
maxkey.support.kerberos.default.fulluserdomain =MAXKEY.ORG
maxkey.login.kerberos.default.fulluserdomain =MAXKEY.ORG
#last 8Bit crypto for Kerberos web Authentication
maxkey.support.kerberos.default.crypto =846KZSzYq56M6d5o
maxkey.login.kerberos.default.crypto =846KZSzYq56M6d5o
#Kerberos Authentication server RUL
maxkey.support.kerberos.default.redirecturi =http://sso.maxkey.top/kerberos/authn/
maxkey.login.kerberos.default.redirecturi =http://sso.maxkey.top/kerberos/authn/
############################################################################
#HTTPHEADER Login configuration #
############################################################################
maxkey.support.httpheader.enable =false
maxkey.support.httpheader.headername =header-user
maxkey.login.httpheader.enable =false
maxkey.login.httpheader.headername =header-user
# iv-user is for IBM Security Access Manager
#config.httpheader.headername=iv-user
############################################################################
#BASIC Login support configuration #
############################################################################
maxkey.support.basic.enable =false
maxkey.login.basic.enable =false
#############################################################################
#WsFederation Login support configuration
@@ -260,14 +264,14 @@ maxkey.support.basic.enable =false
#attributeMutator: (optional) a class (defined by you) that can modify the attributes/assertions returned by the ADFS server
#signingCertificate: ADFS's signing certificate used to validate the token/assertions issued by ADFS.
############################################################################
maxkey.support.wsfederation.identifier =http://adfs.maxkey.top/adfs/services/trust
maxkey.support.wsfederation.url =https://adfs.maxkey.top/adfs/ls/
maxkey.support.wsfederation.principal =upn
maxkey.support.wsfederation.relyingParty =urn:federation:connsec
maxkey.support.wsfederation.signingCertificate =adfs-signing.crt
maxkey.support.wsfederation.tolerance =10000
maxkey.support.wsfederation.upn.suffix =maxkey.org
maxkey.support.wsfederation.logoutUrl =https://adfs.maxkey.top/adfs/ls/?wa=wsignout1.0
maxkey.login.wsfederation.identifier =http://adfs.maxkey.top/adfs/services/trust
maxkey.login.wsfederation.url =https://adfs.maxkey.top/adfs/ls/
maxkey.login.wsfederation.principal =upn
maxkey.login.wsfederation.relyingParty =urn:federation:connsec
maxkey.login.wsfederation.signingCertificate =adfs-signing.crt
maxkey.login.wsfederation.tolerance =10000
maxkey.login.wsfederation.upn.suffix =maxkey.org
maxkey.login.wsfederation.logoutUrl =https://adfs.maxkey.top/adfs/ls/?wa=wsignout1.0
#############################################################################
#OIDC V1.0 METADATA configuration #