From 1caa12ed772b14e2c7cf073f7a589fe71173d2c6 Mon Sep 17 00:00:00 2001 From: winLsy <18332763730@163.com> Date: Wed, 17 Jan 2018 14:47:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BE=AE=E4=BF=A1=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...guration.java => WeChatAutoConfiguration.java} | 6 +++--- ...xinAccessGrant.java => WeChatAccessGrant.java} | 6 +++--- .../{WeixinAdapter.java => WeChatAdapter.java} | 6 +++--- ...nFactory.java => WeChatConnectionFactory.java} | 15 +++++++-------- ...th2Template.java => WeChatOAuth2Template.java} | 6 +++--- ...ceProvider.java => WeChatServiceProvider.java} | 6 +++--- 6 files changed, 22 insertions(+), 23 deletions(-) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/config/{WeixinAutoConfiguration.java => WeChatAutoConfiguration.java} (84%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/{WeixinAccessGrant.java => WeChatAccessGrant.java} (84%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/{WeixinAdapter.java => WeChatAdapter.java} (90%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/{WeixinConnectionFactory.java => WeChatConnectionFactory.java} (81%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/{WeixinOAuth2Template.java => WeChatOAuth2Template.java} (96%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/{WeixinServiceProvider.java => WeChatServiceProvider.java} (82%) diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/config/WeixinAutoConfiguration.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/config/WeChatAutoConfiguration.java similarity index 84% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/config/WeixinAutoConfiguration.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/config/WeChatAutoConfiguration.java index 8307389..7421b8b 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/config/WeixinAutoConfiguration.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/config/WeChatAutoConfiguration.java @@ -5,7 +5,7 @@ package com.micro.fast.security.core.social.wechat.config; import com.micro.fast.security.core.master.SecurityProperties; import com.micro.fast.security.core.social.wechat.WeChatSocialProperties; -import com.micro.fast.security.core.social.wechat.connet.WeixinConnectionFactory; +import com.micro.fast.security.core.social.wechat.connet.WeChatConnectionFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.social.SocialAutoConfigurerAdapter; @@ -20,7 +20,7 @@ import org.springframework.social.connect.ConnectionFactory; */ @Configuration @ConditionalOnProperty(prefix = "ms.security.social.weChat", name = "app-id") -public class WeixinAutoConfiguration extends SocialAutoConfigurerAdapter { +public class WeChatAutoConfiguration extends SocialAutoConfigurerAdapter { @Autowired private SecurityProperties securityProperties; @@ -28,7 +28,7 @@ public class WeixinAutoConfiguration extends SocialAutoConfigurerAdapter { @Override protected ConnectionFactory createConnectionFactory() { WeChatSocialProperties weChatConfig = securityProperties.getSocial().getWeChat(); - return new WeixinConnectionFactory(weChatConfig.getProviderId(), weChatConfig.getAppId(), + return new WeChatConnectionFactory(weChatConfig.getProviderId(), weChatConfig.getAppId(), weChatConfig.getAppSecret()); } } diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinAccessGrant.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatAccessGrant.java similarity index 84% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinAccessGrant.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatAccessGrant.java index 46b258f..91e3867 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinAccessGrant.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatAccessGrant.java @@ -10,16 +10,16 @@ import org.springframework.social.oauth2.AccessGrant; * 所以在这里继承了标准AccessGrant，添加了openId字段，作为对微信access_token信息的封装。 * @author lsy */ -public class WeixinAccessGrant extends AccessGrant { +public class WeChatAccessGrant extends AccessGrant { private String openId; - public WeixinAccessGrant() { + public WeChatAccessGrant() { super(""); } - public WeixinAccessGrant(String accessToken, String scope, String refreshToken, Long expiresIn) { + public WeChatAccessGrant(String accessToken, String scope, String refreshToken, Long expiresIn) { super(accessToken, scope, refreshToken, expiresIn); } diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinAdapter.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatAdapter.java similarity index 90% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinAdapter.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatAdapter.java index 5183846..2153ec7 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinAdapter.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatAdapter.java @@ -13,13 +13,13 @@ import org.springframework.social.connect.UserProfile; * 微信 api适配器，将微信 api的数据模型转为spring social的标准模型。 * @author lsy */ -public class WeixinAdapter implements ApiAdapter { +public class WeChatAdapter implements ApiAdapter { private String openId; - public WeixinAdapter() {} + public WeChatAdapter() {} - public WeixinAdapter(String openId){ + public WeChatAdapter(String openId){ this.openId = openId; } diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinConnectionFactory.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatConnectionFactory.java similarity index 81% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinConnectionFactory.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatConnectionFactory.java index a37ac99..2fb9e60 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinConnectionFactory.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatConnectionFactory.java @@ -14,18 +14,16 @@ import org.springframework.social.oauth2.OAuth2ServiceProvider; /** * 微信连接工厂 - * - * * @author lsy */ -public class WeixinConnectionFactory extends OAuth2ConnectionFactory { +public class WeChatConnectionFactory extends OAuth2ConnectionFactory { /** * @param appId * @param appSecret */ - public WeixinConnectionFactory(String providerId, String appId, String appSecret) { - super(providerId, new WeixinServiceProvider(appId, appSecret), new WeixinAdapter()); + public WeChatConnectionFactory(String providerId, String appId, String appSecret) { + super(providerId, new WeChatServiceProvider(appId, appSecret), new WeChatAdapter()); } /** @@ -33,8 +31,9 @@ public class WeixinConnectionFactory extends OAuth2ConnectionFactory { */ @Override protected String extractProviderUserId(AccessGrant accessGrant) { - if(accessGrant instanceof WeixinAccessGrant) { - return ((WeixinAccessGrant)accessGrant).getOpenId(); + //如果是微信登录就直接返回 openId + if(accessGrant instanceof WeChatAccessGrant) { + return ((WeChatAccessGrant)accessGrant).getOpenId(); } return null; } @@ -61,7 +60,7 @@ public class WeixinConnectionFactory extends OAuth2ConnectionFactory { } private ApiAdapter getApiAdapter(String providerUserId) { - return new WeixinAdapter(providerUserId); + return new WeChatAdapter(providerUserId); } private OAuth2ServiceProvider getOAuth2ServiceProvider() { diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinOAuth2Template.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatOAuth2Template.java similarity index 96% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinOAuth2Template.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatOAuth2Template.java index a00f4bc..932de7c 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinOAuth2Template.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatOAuth2Template.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * 完成微信的OAuth2认证流程的模板类。国内厂商实现的OAuth2每个都不同, spring默认提供的OAuth2Template适应不了，只能针对每个厂商自己微调。 * @author lsy */ -public class WeixinOAuth2Template extends OAuth2Template { +public class WeChatOAuth2Template extends OAuth2Template { private String clientId; @@ -35,7 +35,7 @@ public class WeixinOAuth2Template extends OAuth2Template { private Logger logger = LoggerFactory.getLogger(getClass()); - public WeixinOAuth2Template(String clientId, String clientSecret, String authorizeUrl, String accessTokenUrl) { + public WeChatOAuth2Template(String clientId, String clientSecret, String authorizeUrl, String accessTokenUrl) { super(clientId, clientSecret, authorizeUrl, accessTokenUrl); setUseParametersForClientAuthentication(true); this.clientId = clientId; @@ -93,7 +93,7 @@ public class WeixinOAuth2Template extends OAuth2Template { throw new RuntimeException("获取access token失败, errcode:"+errcode+", errmsg:"+errmsg); } - WeixinAccessGrant accessToken = new WeixinAccessGrant( + WeChatAccessGrant accessToken = new WeChatAccessGrant( MapUtils.getString(result, "access_token"), MapUtils.getString(result, "scope"), MapUtils.getString(result, "refresh_token"), diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinServiceProvider.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatServiceProvider.java similarity index 82% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinServiceProvider.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatServiceProvider.java index 03d4d82..437e50b 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeixinServiceProvider.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/wechat/connet/WeChatServiceProvider.java @@ -14,7 +14,7 @@ import org.springframework.social.oauth2.AbstractOAuth2ServiceProvider; * @author zhailiang * */ -public class WeixinServiceProvider extends AbstractOAuth2ServiceProvider { +public class WeChatServiceProvider extends AbstractOAuth2ServiceProvider { /** * 微信获取授权码的url @@ -29,8 +29,8 @@ public class WeixinServiceProvider extends AbstractOAuth2ServiceProvider * @param appId * @param appSecret */ - public WeixinServiceProvider(String appId, String appSecret) { - super(new WeixinOAuth2Template(appId, appSecret,URL_AUTHORIZE,URL_ACCESS_TOKEN)); + public WeChatServiceProvider(String appId, String appSecret) { + super(new WeChatOAuth2Template(appId, appSecret,URL_AUTHORIZE,URL_ACCESS_TOKEN)); }