* 处理登录
@@ -88,8 +112,7 @@ public abstract class SecurityConfig extends WebSecurityConfigurerAdapter {
@Bean
public LoginUrlAuthenticationEntryPoint loginUrlAuthenticationEntryPoint() {
- LoginUrlAuthenticationEntryPoint loginUrlAuthenticationEntryPoint = new LoginUrlAuthenticationEntryPoint
- ("/login");
+ LoginUrlAuthenticationEntryPoint loginUrlAuthenticationEntryPoint = new LoginUrlAuthenticationEntryPoint("/login");
return loginUrlAuthenticationEntryPoint;
}
@@ -134,7 +157,7 @@ public abstract class SecurityConfig extends WebSecurityConfigurerAdapter {
.cors()
.and().servletApi().disable()
.requestCache().disable()
- .securityContext().securityContextRepository(new ConsumerSecurityContextRepository(redisTemplate0))
+ .securityContext().securityContextRepository(createConsumerSecurityContextRepository())
.and()
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
@@ -142,6 +165,22 @@ public abstract class SecurityConfig extends WebSecurityConfigurerAdapter {
UsernamePasswordAuthenticationFilter.class);
}
+ /**
+ * 创建 SecurityContextRepository
+ *
+ * @return
+ */
+ protected SecurityContextRepository createConsumerSecurityContextRepository() {
+ return new ConsumerSecurityContextRepository(getRedisDB());
+ }
+
+ /**
+ * 初始化放置用户信息的reids库
+ *
+ * @return
+ */
+ protected abstract RedisTemplate getRedisDB();
+
@Override
public void configure(WebSecurity web) throws Exception {
diff --git a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/UserDetailsManager.java b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/UserDetailsManager.java
index 9f89b4a..42a563f 100644
--- a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/UserDetailsManager.java
+++ b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/UserDetailsManager.java
@@ -1,6 +1,7 @@
package com.yexuejc.springboot.base.security;
import com.yexuejc.base.util.StrUtil;
+import com.yexuejc.springboot.base.exception.ClassConvertExeption;
import com.yexuejc.springboot.base.exception.UserNotAuthoriayException;
import com.yexuejc.springboot.base.security.inte.User;
import com.yexuejc.springboot.base.security.inte.UserService;
@@ -23,7 +24,7 @@ import java.util.List;
*/
public class UserDetailsManager extends InMemoryUserDetailsManager {
- private final UserService userService;
+ protected final UserService userService;
public UserDetailsManager(UserService userService) {
this.userService = userService;
@@ -31,22 +32,34 @@ public class UserDetailsManager extends InMemoryUserDetailsManager {
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
- User consumer = userService.getConsumerByUserName(username);
- if (StrUtil.isEmpty(consumer)) {
- throw new UsernameNotFoundException(username);
+ return loadUser(username);
+ }
+
+ protected ConsumerUser loadUser(String username) throws UsernameNotFoundException{
+ Object user = userService.getConsumerByUserName(username);
+ if (user instanceof User) {
+ User consumer = (User) user;
+ if (StrUtil.isEmpty(consumer)) {
+ throw new UsernameNotFoundException(username);
+ }
+ // 处理用户权限
+ List authorities = new ArrayList<>();
+ if (StrUtil.isEmpty(consumer.getRoles())) {
+ throw new UserNotAuthoriayException("用户" + username + "缺少权限");
+ }
+ for (String role : consumer.getRoles()) {
+ authorities.add(new SimpleGrantedAuthority(role));
+ }
+ ConsumerUser consumerUser = new ConsumerUser(consumer.getMobile(), consumer.getPwd(),
+ consumer.getEnable(), consumer.getNonExpire(), true, consumer.getNonLock(),
+ authorities, consumer.getConsumerId(), null, System.currentTimeMillis());
+ return consumerUser;
+ } else if (user instanceof ConsumerUser) {
+ return (ConsumerUser) user;
+ } else {
+ throw new ClassConvertExeption("获取登录用户信息返回结果类型必须是com.yexuejc.springboot.base.security.inte.User实现类" +
+ "或者com.yexuejc.springboot.base.security.ConsumerUser继承类");
}
- // 处理用户权限
- List authorities = new ArrayList<>();
- if (StrUtil.isEmpty(consumer.getRoles())) {
- throw new UserNotAuthoriayException("用户" + username + "缺少权限");
- }
- for (String role : consumer.getRoles()) {
- authorities.add(new SimpleGrantedAuthority(role));
- }
- ConsumerUser consumerUser = new ConsumerUser(consumer.getMobile(), consumer.getPwd(),
- consumer.getEnable(), consumer.getNonExpire(), true, consumer.getNonLock(),
- authorities, consumer.getConsumerId(), null, System.currentTimeMillis());
- return consumerUser;
}
}
diff --git a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/User.java b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/User.java
index c0aba9a..a3baddb 100644
--- a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/User.java
+++ b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/User.java
@@ -3,6 +3,8 @@ package com.yexuejc.springboot.base.security.inte;
import java.util.List;
/**
+ * 登录用户接口
+ *
* @author maxf
* @version 1.0
* @ClassName User
diff --git a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/UserService.java b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/UserService.java
index 599f78f..57bb6f9 100644
--- a/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/UserService.java
+++ b/yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/security/inte/UserService.java
@@ -2,9 +2,13 @@ package com.yexuejc.springboot.base.security.inte;
import com.yexuejc.base.pojo.ApiVO;
import com.yexuejc.springboot.base.constant.BizConsts;
+import com.yexuejc.springboot.base.exception.UserNotAuthoriayException;
import com.yexuejc.springboot.base.security.ConsumerToken;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
/**
+ * 用户登录处理接口
+ *
* @author maxf
* @version 1.0
* @ClassName UserService
@@ -14,11 +18,18 @@ import com.yexuejc.springboot.base.security.ConsumerToken;
public interface UserService {
/**
* 根据用户名到数据库查询用户
+ *
+ *
+ *
+ * 获取登录用户信息返回结果类型必须是
+ * {@link com.yexuejc.springboot.base.security.inte.User}实现类
+ * 或者{@link com.yexuejc.springboot.base.security.ConsumerUser}继承类
+ *
*
* @param username 登录账号
* @return
*/
- User getConsumerByUserName(String username);
+ Object getConsumerByUserName(String username) throws UserNotAuthoriayException, UsernameNotFoundException;
/**
* 校验短信验证码=>短信登录
@@ -32,17 +43,29 @@ public interface UserService {
/**
* 校验第三方登录openid
+ *
+ * 获取登录用户信息返回结果类型必须是
+ * {@link com.yexuejc.springboot.base.security.inte.User}实现类
+ * 或者{@link org.springframework.security.core.userdetails.UserDetails}实现类
+ * 或者{@link com.yexuejc.springboot.base.security.ConsumerUser}继承类
+ *
*
* @param consumerToken 登录信息
- * @return apiVO.setObject1(User.class) 自己封装登录用户信息
+ * @return 自己封装登录用户信息
*/
- ApiVO checkOpenId(ConsumerToken consumerToken);
+ Object checkOpenId(ConsumerToken consumerToken);
/**
* 没有账号时根据登录信息创建账号
+ *
+ * 获取登录用户信息返回结果类型必须是
+ * {@link com.yexuejc.springboot.base.security.inte.User}实现类
+ * 或者{@link org.springframework.security.core.userdetails.UserDetails}实现类
+ * 或者{@link com.yexuejc.springboot.base.security.ConsumerUser}继承类
+ *
*
* @param consumerToken 登录信息
- * @return
+ * @return 自己封装登录用户信息
*/
- ApiVO addConsumer(ConsumerToken consumerToken);
+ Object addConsumer(ConsumerToken consumerToken);
}
diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/MySecurityConfig.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/MySecurityConfig.java
index 1cfb026..c59006f 100644
--- a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/MySecurityConfig.java
+++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/MySecurityConfig.java
@@ -47,6 +47,11 @@ public class MySecurityConfig extends SecurityConfig {
@Qualifier(MutiRedisAutoConfiguration.BEAN_REDIS_TEMPLATE0)
private RedisTemplate redisTemplate0;
+ @Override
+ protected RedisTemplate getRedisDB() {
+ return redisTemplate0;
+ }
+
/**
* 保存登录信息至redis
*
@@ -184,4 +189,5 @@ public class MySecurityConfig extends SecurityConfig {
response.getWriter().close();
});
}
+
}
diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/UserServiceImpl.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/UserServiceImpl.java
index 22a82eb..d8b7623 100644
--- a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/UserServiceImpl.java
+++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/UserServiceImpl.java
@@ -13,11 +13,13 @@ import com.yexuejc.springboot.base.constant.LogTypeConsts;
import com.yexuejc.springboot.base.exception.ThirdPartyAuthorizationException;
import com.yexuejc.springboot.base.mapper.ConsumerMapper;
import com.yexuejc.springboot.base.security.domain.Consumer;
-import com.yexuejc.springboot.base.security.inte.User;
import com.yexuejc.springboot.base.security.inte.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -48,14 +50,37 @@ public class UserServiceImpl implements UserService {
* @return
*/
@Override
- public User getConsumerByUserName(String username) {
+ public Object getConsumerByUserName(String username) {
+ if (StrUtil.isEmpty(username)) {
+ throw new UsernameNotFoundException("username为空，一般是第三方登录来的，直接抛出UsernameNotFoundException就是");
+ }
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("mobile", username);
Consumer consumer = consumerMapper.selectOne(queryWrapper);
- ArrayList roles = new ArrayList<>();
+ if (null == consumer) {
+ /**
+ * 1.抛出UsernameNotFoundException这个异常如果是第三方登录会走 {@link #checkOpenId(ConsumerToken)}
+ * 2.抛出其他Exception可以自己到{@link MySecurityConfig#loginHodler(ConsumerAuthenticationProcessingFilter)}
+ * 里面的filter.setAuthenticationFailureHandler()中做特殊处理
+ */
+ throw new UsernameNotFoundException("没有该账号相关信息");
+ }
+ //h2不支持json，人为处理角色
+ ArrayList roles = new ArrayList<>();
roles.add("ROLE_CONSUMER");
consumer.setRoles(roles);
- return consumer;
+ //1.consumer为User的实现类
+// return consumer;
+
+ //2. 自己创建ConsumerUser，直接返回
+ List authorities = new ArrayList<>();
+ for (String role : consumer.getRoles()) {
+ authorities.add(new SimpleGrantedAuthority(role));
+ }
+ ConsumerUser consumerUser = new ConsumerUser(consumer.getMobile(), consumer.getPwd(),
+ consumer.getEnable(), consumer.getNonExpire(), true, consumer.getNonLock(),
+ authorities, consumer.getConsumerId(), null, System.currentTimeMillis());
+ return consumerUser;
}
/**
@@ -88,15 +113,14 @@ public class UserServiceImpl implements UserService {
}
/**
+ * 第三方登录
* 校验openid 根据自己业务做判断
- *
- * 返回：封装登录用户信息到 apiVO.setObject1(User.class) 自己封装登录用户信息
*
* @param consumerToken 登录信息
* @return
*/
@Override
- public ApiVO checkOpenId(ConsumerToken consumerToken) {
+ public Object checkOpenId(ConsumerToken consumerToken) {
ApiVO apiVO = new ApiVO(ApiVO.STATUS.F, "没有找到用户信息");
switch (consumerToken.getLogtype()) {
case LogTypeConsts.QQ:
@@ -111,9 +135,89 @@ public class UserServiceImpl implements UserService {
default:
break;
}
- return apiVO;
+ if (apiVO.isFail()) {
+ /**
+ * 未查到:
+ * 1.返回null会走（数据库没有这个openid[第三方账号]信息）新增流程 {@link #addConsumer(ConsumerToken)}
+ * 2.也可以自己创建一个带有特殊标识的ConsumerUser，然后在 {@link MySecurityConfig#loginHodler(ConsumerAuthenticationProcessingFilter)}
+ * 里面的filter.setAuthenticationSuccessHandler()中做特殊处理 ps:假装登录成功 :)
+ */
+ return null;
+ }
+ //h2不支持json，人为处理角色
+ ArrayList roles = new ArrayList<>();
+ roles.add("ROLE_CONSUMER");
+ apiVO.getObject1(Consumer.class).setRoles(roles);
+ //根据openid到数据库查到consumer返回
+ return apiVO.getObject1(Consumer.class);
}
+ /**
+ * {@link #checkOpenId(ConsumerToken)} 返回null会走该方法
+ * 没有账号时处理自己的业务，此处必须返回 构造出的登录用户，否则会抛出{@link ThirdPartyAuthorizationException 第三方授权异常}
+ *
+ *
+ * @param consumerToken 登录信息
+ * @return
+ */
+ @Override
+ public Object addConsumer(ConsumerToken consumerToken) {
+ Consumer consumer = new Consumer();
+ consumer.setConsumerId(StrUtil.genUUID());
+ consumer.setMobile(StrUtil.isNotEmpty(consumerToken.getUsername()) ? consumerToken.getUsername() : consumerToken.getOpenid());
+ consumer.setPwd(StrUtil.toMD5("123456"));
+ consumer.setEnable(true);
+ consumer.setNonExpire(true);
+ consumer.setNonLock(true);
+ List roles = new ArrayList<>();
+ roles.add("ROLE_CONSUMER");
+ consumer.setRoles(roles);
+ switch (consumerToken.getLogtype()) {
+ case LogTypeConsts.SMS:
+ ApiVO apiVO = checkSmsCode2Redis(BizConsts.CONSUMER_LOGIN_SMS, consumerToken.getUsername(),
+ consumerToken.getSmscode());
+ if (apiVO.isFail()) {
+ throw new ThirdPartyAuthorizationException("短信验证码错误");
+ }
+ consumer.setNickname(consumerToken.getUsername());
+ consumer.setHead("/head/def.png");
+ consumer.setRegType(DictRegTypeConsts.DICT_MOBILE);
+ break;
+ case LogTypeConsts.QQ:
+ consumer.setQqId(consumerToken.getOpenid());
+ consumer.setNickname(consumerToken.getNickname());
+ setHeader(consumerToken, consumer, false);
+ setSex(consumerToken, consumer);
+ consumer.setRegType(DictRegTypeConsts.DICT_QQ);
+ break;
+ case LogTypeConsts.WECHAT:
+ consumer.setWechatId(consumerToken.getOpenid());
+ consumer.setNickname(consumerToken.getNickname());
+ setHeader(consumerToken, consumer, false);
+ setSex(consumerToken, consumer);
+ consumer.setRegType(DictRegTypeConsts.DICT_WECHAT);
+ break;
+ case LogTypeConsts.WEIBO:
+ consumer.setWeiboId(consumerToken.getOpenid());
+ consumer.setNickname(consumerToken.getNickname());
+ setHeader(consumerToken, consumer, false);
+ setSex(consumerToken, consumer);
+ consumer.setRegType(DictRegTypeConsts.DICT_WEIBO);
+ break;
+ default:
+ throw new ThirdPartyAuthorizationException("暂不支持该第三方授权");
+ }
+ Integer result = consumerMapper.insert(consumer);
+ if (result < 1) {
+ /**
+ * 会抛出{@link ThirdPartyAuthorizationException 第三方授权异常}
+ */
+ return null;
+ }
+ return consumer;
+ }
+
+
/**
* 第三方登录 QQ登录
*
@@ -173,69 +277,6 @@ public class UserServiceImpl implements UserService {
}
- /**
- * 没有账号时处理自己的业务，此次必须返回 构造出的登录用户，否则会抛出{@link ThirdPartyAuthorizationException 第三方授权异常}
- *
- * 返回：封装登录用户信息到 apiVO.setObject1(User.class) 自己封装登录用户信息
- *
- * @param consumerToken 登录信息
- * @return
- */
- @Override
- public ApiVO addConsumer(ConsumerToken consumerToken) {
- Consumer consumer = new Consumer();
- consumer.setConsumerId(StrUtil.genUUID());
- consumer.setMobile(StrUtil.isNotEmpty(consumerToken.getUsername()) ? consumerToken.getUsername() : consumerToken.getOpenid());
- consumer.setPwd(StrUtil.toMD5("123456"));
- consumer.setEnable(true);
- consumer.setNonExpire(true);
- consumer.setNonLock(true);
- List roles = new ArrayList<>();
- roles.add("ROLE_CONSUMER");
- consumer.setRoles(roles);
- switch (consumerToken.getLogtype()) {
- case LogTypeConsts.SMS:
- ApiVO apiVO = checkSmsCode2Redis(BizConsts.CONSUMER_LOGIN_SMS, consumerToken.getUsername(),
- consumerToken.getSmscode());
- if (apiVO.isFail()) {
- return apiVO;
- }
- consumer.setNickname(consumerToken.getUsername());
- consumer.setHead("/head/def.png");
- consumer.setRegType(DictRegTypeConsts.DICT_MOBILE);
- break;
- case LogTypeConsts.QQ:
- consumer.setQqId(consumerToken.getOpenid());
- consumer.setNickname(consumerToken.getNickname());
- setHeader(consumerToken, consumer, false);
- setSex(consumerToken, consumer);
- consumer.setRegType(DictRegTypeConsts.DICT_QQ);
- break;
- case LogTypeConsts.WECHAT:
- consumer.setWechatId(consumerToken.getOpenid());
- consumer.setNickname(consumerToken.getNickname());
- setHeader(consumerToken, consumer, false);
- setSex(consumerToken, consumer);
- consumer.setRegType(DictRegTypeConsts.DICT_WECHAT);
- break;
- case LogTypeConsts.WEIBO:
- consumer.setWeiboId(consumerToken.getOpenid());
- consumer.setNickname(consumerToken.getNickname());
- setHeader(consumerToken, consumer, false);
- setSex(consumerToken, consumer);
- consumer.setRegType(DictRegTypeConsts.DICT_WEIBO);
- break;
- default:
- return new ApiVO(ApiVO.STATUS.F, "暂不支持的登录方式");
- }
- Integer result = consumerMapper.insert(consumer);
- if (result < 1) {
- return new ApiVO(ApiVO.STATUS.F, RespsConsts.CODE_FAIL, "登录失败");
- }
- return new ApiVO(ApiVO.STATUS.S).setObject1(consumer);
- }
-
-
public Consumer getConsumerByQQOpenid(String openid) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("qq_id", openid);
diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/domain/Consumer.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/domain/Consumer.java
index 5ab3da0..bf7d8d2 100644
--- a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/domain/Consumer.java
+++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/security/domain/Consumer.java
@@ -238,6 +238,7 @@ public class Consumer extends Model implements User {
return this;
}
+ @Override
public List getRoles() {
return roles;
}
diff --git a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/SecurityCtrl.java b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/SecurityCtrl.java
index 8f5ea6f..549faf9 100644
--- a/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/SecurityCtrl.java
+++ b/yexuejc-springboot-base/src/test/java/com/yexuejc/springboot/base/web/SecurityCtrl.java
@@ -1,7 +1,23 @@
package com.yexuejc.springboot.base.web;
+import com.yexuejc.base.http.Resps;
+import com.yexuejc.base.pojo.ApiVO;
+import com.yexuejc.base.util.RegexUtil;
+import com.yexuejc.base.util.StrUtil;
+import com.yexuejc.springboot.base.autoconfigure.MutiRedisAutoConfiguration;
+import com.yexuejc.springboot.base.constant.BizConsts;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
/**
*
* Security 登录注册相关controller
@@ -19,5 +35,49 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class SecurityCtrl {
+ @Autowired
+ @Qualifier(MutiRedisAutoConfiguration.BEAN_REDIS_TEMPLATE1)
+ RedisTemplate redisTemplate;
+
+ /**
+ * 登录发送短信
+ *
+ * @param mobile
+ * @return
+ */
+ @RequestMapping(value = "/login/{mobile}", method = RequestMethod.POST)
+ public Resps login(@PathVariable String mobile) {
+ if (!RegexUtil.regex(mobile, RegexUtil.REGEX_MOBILE)) {
+ return Resps.fail("手机号不正确");
+ }
+ ApiVO apiVO = sendSmsCode(BizConsts.CONSUMER_LOGIN_SMS, mobile);
+ if (apiVO.isFail()) {
+ return Resps.fail(apiVO.getMsg());
+ }
+ return Resps.success(apiVO.getMsg());
+ }
+
+ private ApiVO sendSmsCode(String smsType, String mobile) {
+ String smsId = StrUtil.genUUID(30);
+ String code = StrUtil.genNum().substring(2, 8);
+ //自己接入短信发送
+ boolean result = true;
+ if (result) {
+ //成功
+ //存reids
+ Map map = new HashMap<>();
+ map.put("smsId", smsId);
+ map.put("code", code);
+ map.put("trade_id", "短信返回id");
+ map.put("validatedNums", 0);
+ redisTemplate.afterPropertiesSet();
+ redisTemplate.opsForHash().putAll(smsType + "." + mobile, map);
+ // 过期时间：5分钟
+ redisTemplate.expire(smsType + "." + mobile, 5 * 60, TimeUnit.SECONDS);
+ return new ApiVO(ApiVO.STATUS.S, "短信发送成功");
+ } else {
+ return new ApiVO(ApiVO.STATUS.F, "短信发送失败");
+ }
+ }
}