Skip to content

Commit 36edd83

Browse files
author
shimingxy
committed
v1.2.1 GA
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
1 parent 008793f commit 36edd83

File tree

304 files changed

+68
-49148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+68
-49148
lines changed

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@ subprojects {
202202
compile group: 'org.opensaml', name: 'openws', version: '1.5.4'
203203
compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.4'
204204

205+
compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '8.8'
206+
compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
207+
compile group: 'net.minidev', name: 'json-smart', version: '2.3'
208+
compile group: 'net.minidev', name: 'asm', version: '1.0.2'
209+
205210
compile group: 'cn.hutool', name: 'hutool-core', version: '5.1.2'
206211
compile group: 'cn.hutool', name: 'hutool-http', version: '5.1.2'
207212
compile group: 'me.zhyd.oauth', name: 'JustAuth', version: '1.13.2'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group =org.maxkey
2-
version =1.2.0.RELEASE
2+
version =1.2.1.RELEASE
33
vendor =https://github.com/shimingxy/MaxKey
44
author =shimingxy
55

maxkey-authentications/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ dependencies {
1010

1111
compile project(":maxkey-core")
1212
compile project(":maxkey-dao")
13-
compile project(":maxkey-jose-jwt")
1413
compile project(":maxkey-client-sdk")
1514
compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0")
1615
compile project(":maxkey-protocols:maxkey-protocol-saml-2.0")

maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class MaxkeyApi10a extends DefaultApi10a
66
{
7-
private static final String DEFAULT_WEB_URL = "http://sso.maxkey.org/maxkey";
7+
private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey";
88
private static final String AUTHORIZATION_URL = DEFAULT_WEB_URL+"/oauth/v10a/authz?oauth_token=%s";
99

1010
public MaxkeyApi10a() {

maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class MaxkeyApi20 extends DefaultApi20 {
1111
//approval_prompt:force or auto
12-
private static final String DEFAULT_WEB_URL = "http://sso.maxkey.org/maxkey";
12+
private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey";
1313

1414
private static final String AUTHORIZATION_URL = "%s/oauth/v20/authorize?client_id=%s&response_type=code&redirect_uri=%s&approval_prompt=auto";
1515

maxkey-core/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ dependencies {
44
//local jars
55
compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')
66

7-
compile project(":maxkey-jose-jwt")
87
}

maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void listEnvVars() {
164164
public void showLicense(){
165165
_logger.info("----------------------------------------------------------------------------------------------------");
166166
_logger.info("+ Single Sign On ( SSO ) ");
167-
_logger.info("+ MaxKey Version 1.2 GA");
167+
_logger.info("+ MaxKey Version 1.2.1 GA");
168168
_logger.info("");
169169
_logger.info("+ Apache License 2.0");
170170
_logger.info("+ https://github.com/shimingxy/MaxKey");

maxkey-jose-jwt/.classpath

Lines changed: 0 additions & 12 deletions
This file was deleted.

maxkey-jose-jwt/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

maxkey-jose-jwt/.project

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)