Skip to content

Commit

Permalink
v1.2.1 GA
Browse files Browse the repository at this point in the history
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
  • Loading branch information
shimingxy committed Mar 3, 2020
1 parent 008793f commit 36edd83
Show file tree
Hide file tree
Showing 304 changed files with 68 additions and 49,148 deletions.
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ subprojects {
compile group: 'org.opensaml', name: 'openws', version: '1.5.4'
compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.4'

compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '8.8'
compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
compile group: 'net.minidev', name: 'json-smart', version: '2.3'
compile group: 'net.minidev', name: 'asm', version: '1.0.2'

compile group: 'cn.hutool', name: 'hutool-core', version: '5.1.2'
compile group: 'cn.hutool', name: 'hutool-http', version: '5.1.2'
compile group: 'me.zhyd.oauth', name: 'JustAuth', version: '1.13.2'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group =org.maxkey
version =1.2.0.RELEASE
version =1.2.1.RELEASE
vendor =https://github.com/shimingxy/MaxKey
author =shimingxy

Expand Down
1 change: 0 additions & 1 deletion maxkey-authentications/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies {

compile project(":maxkey-core")
compile project(":maxkey-dao")
compile project(":maxkey-jose-jwt")
compile project(":maxkey-client-sdk")
compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0")
compile project(":maxkey-protocols:maxkey-protocol-saml-2.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

public MaxkeyApi10a() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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

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

Expand Down
1 change: 0 additions & 1 deletion maxkey-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ dependencies {
//local jars
compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')

compile project(":maxkey-jose-jwt")
}
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void listEnvVars() {
public void showLicense(){
_logger.info("----------------------------------------------------------------------------------------------------");
_logger.info("+ Single Sign On ( SSO ) ");
_logger.info("+ MaxKey Version 1.2 GA");
_logger.info("+ MaxKey Version 1.2.1 GA");
_logger.info("");
_logger.info("+ Apache License 2.0");
_logger.info("+ https://github.com/shimingxy/MaxKey");
Expand Down
12 changes: 0 additions & 12 deletions maxkey-jose-jwt/.classpath

This file was deleted.

1 change: 0 additions & 1 deletion maxkey-jose-jwt/.gitignore

This file was deleted.

40 changes: 0 additions & 40 deletions maxkey-jose-jwt/.project

This file was deleted.

11 changes: 0 additions & 11 deletions maxkey-jose-jwt/.settings/org.eclipse.buildship.core.prefs

This file was deleted.

2 changes: 0 additions & 2 deletions maxkey-jose-jwt/.settings/org.eclipse.core.resources.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions maxkey-jose-jwt/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

5 changes: 0 additions & 5 deletions maxkey-jose-jwt/.settings/org.eclipse.wst.common.component

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions maxkey-jose-jwt/build.gradle

This file was deleted.

5 changes: 0 additions & 5 deletions maxkey-jose-jwt/src/main/java/META-INF/MANIFEST.MF

This file was deleted.

10 changes: 0 additions & 10 deletions maxkey-jose-jwt/src/main/java/META-INF/README

This file was deleted.

173 changes: 0 additions & 173 deletions maxkey-jose-jwt/src/main/java/com/nimbusds/jose/Algorithm.java

This file was deleted.

Loading

1 comment on commit 36edd83

@shimingxy
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v1.2.1 GA

Please sign in to comment.