From 8e61400c290eccad73ddbc5bb5de6e4ed6e4f83c Mon Sep 17 00:00:00 2001 From: o2null Date: Thu, 18 Nov 2021 11:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dssoencrypt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jaxrs/authentication/ActionOauthBind.java | 3 +++ .../authentication/jaxrs/sso/ActionGetEncrypt.java | 7 +++---- .../authentication/jaxrs/sso/ActionPostEncrypt.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthBind.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthBind.java index 93405cdc70..503f0e6f2b 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthBind.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthBind.java @@ -32,9 +32,12 @@ class ActionOauthBind extends BaseAction { // 获取oauthClient对象 OauthClient oauthClient = oauthClient(name); Map param = oauthCreateParam(oauthClient, code, redirectUri); + logger.debug("oauth create param:{}", param); oauthToken(oauthClient, param); + logger.debug("oauth token param:{}", param); oauthCheckAccessToken(param); oauthInfo(oauthClient, param); + logger.debug("oauth info param:{}", param); String credential = Objects.toString(param.get(oauthClient.getInfoCredentialField()), ""); oauthCheckCredential(credential); logger.debug("credential:{}", credential); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java index 99c66f9181..2ea73337d1 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java @@ -5,7 +5,6 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.annotation.FieldDescribe; @@ -17,7 +16,6 @@ import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.Crypto; -import com.x.base.core.project.tools.DefaultCharset; class ActionGetEncrypt extends BaseAction { @@ -40,8 +38,9 @@ class ActionGetEncrypt extends BaseAction { throw new ExceptionClientNotExist(client); } String str = credential + TOKEN_SPLIT + new Date().getTime(); - byte[] bs = Crypto.encrypt(str.getBytes(DefaultCharset.charset), key.getBytes()); - String token = new String(Base64.encodeBase64(bs), DefaultCharset.charset); + String token = Crypto.encrypt(str, key); +// byte[] bs = Crypto.encrypt(str.getBytes(DefaultCharset.charset), key.getBytes()); +// String token = new String(Base64.encodeBase64(bs), DefaultCharset.charset); Wo wo = new Wo(); wo.setToken(token); result.setData(wo); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java index 96c62ddb42..11fb636025 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java @@ -24,7 +24,7 @@ class ActionPostEncrypt extends BaseAction { ActionResult execute(HttpServletRequest request, HttpServletResponse response, EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { - logger.debug(effectivePerson, "receive:{}", jsonElement); + logger.debug("receive:{}", jsonElement::toString); ActionResult result = new ActionResult<>(); Wi wi = this.convertToWrapIn(jsonElement, Wi.class); if (StringUtils.isEmpty(wi.getClient())) { -- GitLab