diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java index d3e58c10b1d583c1d607895f0dabc0f18f2f8b44..d5c2654b24ecf6437ecd2781dc9ed8bd9dcdd055 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java @@ -4,7 +4,7 @@ import org.maxkey.client.oauth.model.Token; public class MaxkeyApi10a extends DefaultApi10a { - private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey"; + private static final String DEFAULT_WEB_URL = "https://sso.maxkey.top/maxkey"; private static final String AUTHORIZATION_URL = DEFAULT_WEB_URL+"/oauth/v10a/authz?oauth_token=%s"; public MaxkeyApi10a() { diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java index a53e5e0d25f918367566190af1cdd976c24bed00..6c6e1617d59ef899e28ebaa85acbda6b31ac6d5c 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java @@ -9,7 +9,7 @@ import org.maxkey.client.utils.Preconditions; public class MaxkeyApi20 extends DefaultApi20 { //approval_prompt:force or auto - private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey"; + private static final String DEFAULT_WEB_URL = "https://sso.maxkey.top/maxkey"; private static final String AUTHORIZATION_URL = "%s/oauth/v20/authorize?client_id=%s&response_type=code&redirect_uri=%s&approval_prompt=auto"; diff --git a/maxkey-web-manage/src/main/resources/maxkey.properties b/maxkey-web-manage/src/main/resources/maxkey.properties index 88d20d586e23b52f27d67e71f5fc1776171dd9c0..f1594aaa1e5f3fd4473d509327c84385616700fe 100644 --- a/maxkey-web-manage/src/main/resources/maxkey.properties +++ b/maxkey-web-manage/src/main/resources/maxkey.properties @@ -2,7 +2,7 @@ # MaxKey Management ############################################################################ # domain name configuration -config.server.domain=maxkey.org +config.server.domain=maxkey.top config.server.domain.sub=sso.${config.server.domain} config.server.name=http://${config.server.domain.sub} config.server.prefix.uri=${config.server.name}:9521/maxkey-mgt @@ -50,10 +50,10 @@ config.saml.v20.idp.keystore.password=maxkey config.saml.v20.idp.keystore.private.key.password=maxkey config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks #keystore id for sec -config.saml.v20.idp.issuing.entity.id=maxkey.org -config.saml.v20.idp.issuer=https://sso.maxkey.org/maxkey/saml +config.saml.v20.idp.issuing.entity.id=maxkey.top +config.saml.v20.idp.issuer=https://sso.maxkey.top/maxkey/saml -config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.org/ +config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.top/ #saml sp keystore config.saml.v20.sp.keystore.password=maxkey diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl index db42c43ea243aebaa53e430b08bef3521cd265d9..3222a0d583a870a3710056bab8c6f7b52747cfab 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl @@ -212,7 +212,6 @@ $(function(){