LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.3 RC

Browse Source
This commit is contained in:
shimingxy
2020-04-01 22:04:17 +08:00
parent b7db556e23
commit fe2d3ed797
9 changed files with 413 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
maxkey-web-manage/src/main/resources/config/applicationConfig.properties
View File

@@ -63,7 +63,27 @@ config.email.smtpHost=smtp.exmail.qq.com
config.email.port=25
config.email.senderMail=test@maxkey.org
config.email.ssl=false
############################################################################
# Login configuration
#enable captcha
config.login.captcha=true
#enable two factor,use one time password
config.login.onetimepwd=true
#enable social sign on
config.login.socialsignon=true
#Enable kerberos/SPNEGO
config.login.kerberos=true
#wsFederation
config.login.wsfederation=false
#remeberme
config.login.remeberme=true
#validity
config.login.remeberme.validity=
#default.uri
#to appList page
config.login.default.uri=appList
config.ipaddress.whitelist=false
############################################################################
# SAML V2.0 configuration
# saml common

23
maxkey-web-manage/src/main/resources/config/applicationLogin.properties
View File

@@ -1,23 +0,0 @@
############################################################################
# MaxKey
############################################################################
# Login configuration
#enable captcha
config.login.captcha=true
#enable two factor,use one time password
config.login.onetimepwd=true
#enable social sign on
config.login.socialsignon=true
#Enable kerberos/SPNEGO
config.login.kerberos=true
#wsFederation
config.login.wsfederation=false
#remeberme
config.login.remeberme=true
#validity
config.login.remeberme.validity=
#default.uri
#to appList page
config.login.default.uri=appList
config.ipaddress.whitelist=false

5
maxkey-web-manage/src/main/resources/spring/maxkey-mgt.xml
View File

@@ -26,9 +26,8 @@
<bean id="propertySourcesPlaceholderConfigurer" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="locations">
<list>
<value>classpath:config/applicationConfig.properties</value>
<value>classpath:config/applicationLogin.properties</value>
<value>classpath:config/applicationConfig.properties</value>
<value>classpath:application.properties</value>
</list>
</property>
<property name="ignoreUnresolvablePlaceholders" value="true"/>