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

v1.2.1 GA

Browse Source 
SAML 2.0 optimization,support 阿里云、腾讯云 SSO
maxkey-mgt main report
APPS ExtraAttr
fix ui bugs
remove maxkey-jose-jwt
dep com.nimbusds nimbus-jose-jwt
dep net.jcip jcip-annotations
dep net.minidev json-smart
dep net.minidev asm
This commit is contained in:
shimingxy
2020-03-03 12:46:55 +08:00
parent 008793f46c
commit 36edd83c39
304 changed files with 68 additions and 49148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
View File

@@ -62,30 +62,31 @@ public class MaxKeyConfig {
};
}
@Bean
public Connector connector(){
Connector connector=new Connector("org.apache.coyote.http11.Http11NioProtocol");
connector.setScheme("http");
connector.setPort(80);
connector.setSecure(false);
connector.setRedirectPort(443);
return connector;
}
@Bean
public Connector connector() {
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
connector.setScheme("http");
connector.setPort(80);
connector.setSecure(false);
connector.setRedirectPort(443);
return connector;
}
@Bean
public TomcatServletWebServerFactory tomcatServletWebServerFactory(Connector connector) {
TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
@Override
protected void postProcessContext(Context context) {
SecurityConstraint securityConstraint = new SecurityConstraint();
securityConstraint.setUserConstraint("CONFIDENTIAL");
SecurityCollection collection = new SecurityCollection();
collection.addPattern("/*");
securityConstraint.addCollection(collection);
context.addConstraint(securityConstraint);
}
};
tomcat.addAdditionalTomcatConnectors(connector);
return tomcat;
}
@Bean
public TomcatServletWebServerFactory tomcatServletWebServerFactory(Connector connector){
TomcatServletWebServerFactory tomcat=new TomcatServletWebServerFactory(){
@Override
protected void postProcessContext(Context context) {
SecurityConstraint securityConstraint=new SecurityConstraint();
securityConstraint.setUserConstraint("CONFIDENTIAL");
SecurityCollection collection=new SecurityCollection();
collection.addPattern("/*");
securityConstraint.addCollection(collection);
context.addConstraint(securityConstraint);
}
};
tomcat.addAdditionalTomcatConnectors(connector);
return tomcat;
}
}

2
maxkey-web-maxkey/src/main/resources/application.properties
View File

@@ -15,7 +15,7 @@ server.servlet.context-path=/maxkey
application.name=MaxKey
#message.properties global.application.version is need to update
application.formatted-version=v1.2 GA
application.formatted-version=v1.2.1 GA
#for freemarker
spring.freemarker.template-loader-path=classpath:/templates/views

2
maxkey-web-maxkey/src/main/resources/messages/message.properties
View File

@@ -1,5 +1,5 @@
global.application=MaxKey\u5E94\u7528\u5B89\u5168\u7CFB\u7EDF
global.application.version=v1.2 GA
global.application.version=v1.2.1 GA
global.change.language=\u8BED\u97F3\u9009\u62E9
global.change.language.en=English
global.change.language.zh=\u4E2D\u6587

2
maxkey-web-maxkey/src/main/resources/messages/message_en.properties
View File

@@ -1,5 +1,5 @@
global.application=MaxKey Secure Sign-on System
global.application.version=v1.2 GA
global.application.version=v1.2.1 GA
global.change.language=Language
global.change.language.en=English
global.change.language.zh=\u4E2D\u6587