增加短信登录方式 修改项目结构
parent
903d358002
commit
24cc5baef0
@ -0,0 +1,35 @@
|
||||
package com.baiye.core.base.api;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Enzo
|
||||
* @date : 2023/4/10
|
||||
*/
|
||||
@Data
|
||||
public class BaseResult implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 是否成功
|
||||
*/
|
||||
protected boolean success;
|
||||
|
||||
/**
|
||||
* 错误信息
|
||||
*/
|
||||
protected String message;
|
||||
|
||||
/**
|
||||
* 详细信息
|
||||
*/
|
||||
protected String detailMessage;
|
||||
|
||||
/**
|
||||
* 返回数据
|
||||
*/
|
||||
protected Object data;
|
||||
}
|
@ -0,0 +1,44 @@
|
||||
package com.baiye.core.factory;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
|
||||
import org.springframework.core.env.PropertiesPropertySource;
|
||||
import org.springframework.core.env.PropertySource;
|
||||
import org.springframework.core.io.support.EncodedResource;
|
||||
import org.springframework.core.io.support.PropertySourceFactory;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.Properties;
|
||||
|
||||
/**
|
||||
* 加载yml格式的自定义配置文件
|
||||
*
|
||||
* @author aristotle
|
||||
* @link https://blog.csdn.net/zxl8899/article/details/106382719/
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
public class YamlPropertySourceFactory implements PropertySourceFactory {
|
||||
|
||||
public PropertySource<?> createPropertySource(String name, EncodedResource resource) throws IOException {
|
||||
Properties propertiesFromYaml = loadYamlIntoProperties(resource);
|
||||
String sourceName = name != null ? name : resource.getResource().getFilename();
|
||||
assert sourceName != null;
|
||||
return new PropertiesPropertySource(sourceName, propertiesFromYaml);
|
||||
}
|
||||
|
||||
private Properties loadYamlIntoProperties(EncodedResource resource) throws FileNotFoundException {
|
||||
try {
|
||||
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
|
||||
factory.setResources(resource.getResource());
|
||||
factory.afterPropertiesSet();
|
||||
return factory.getObject();
|
||||
} catch (IllegalStateException e) {
|
||||
Throwable cause = e.getCause();
|
||||
if (cause instanceof FileNotFoundException) {
|
||||
throw (FileNotFoundException) e.getCause();
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.exception.global;
|
||||
package com.baiye;
|
||||
|
||||
/**
|
||||
*
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.exception.global;
|
||||
package com.baiye;
|
||||
|
||||
/**
|
||||
*
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.exception.global;
|
||||
package com.baiye;
|
||||
|
||||
/**
|
||||
* @author Enzo
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.exception.global;
|
||||
package com.baiye;
|
||||
|
||||
/**
|
||||
*
|
@ -0,0 +1,23 @@
|
||||
package com.baiye.config;
|
||||
|
||||
import com.baiye.core.factory.YamlPropertySourceFactory;
|
||||
import com.baiye.handle.GlobalExceptionHandler;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.PropertySource;
|
||||
|
||||
/**
|
||||
* 统一异常处理配置
|
||||
* @author xuzhanfu
|
||||
*/
|
||||
@Configuration
|
||||
@ComponentScan(value="com.baiye.config")
|
||||
@PropertySource(factory = YamlPropertySourceFactory.class, value = "classpath:cdp-error.yml")
|
||||
public class ExceptionConfiguration {
|
||||
|
||||
@Bean
|
||||
public GlobalExceptionHandler baseExceptionHandler(){
|
||||
return new GlobalExceptionHandler();
|
||||
}
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
package com.baiye.exception.global.util;
|
||||
package com.baiye.util;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baiye.exception.global.BadRequestException;
|
||||
import com.baiye.BadRequestException;
|
||||
|
||||
/**
|
||||
* @author Enzo
|
@ -0,0 +1 @@
|
||||
com.baiye.config.ExceptionConfiguration
|
@ -0,0 +1,11 @@
|
||||
#出现错误时, 直接抛出异常
|
||||
spring:
|
||||
mvc:
|
||||
throw-exception-if-no-handler-found: true
|
||||
#不要为我们工程中的资源文件建立映射
|
||||
resources:
|
||||
add-mappings: false
|
||||
#getErrorPath()@deprecated since 2.3.0 in favor of setting the property `server.error.path`
|
||||
server:
|
||||
error:
|
||||
path: /error
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth;
|
||||
package com.baiye;
|
||||
|
||||
import com.baiye.annotation.EnableCustomizeFeignClient;
|
||||
import com.baiye.config.LoginProperties;
|
@ -1,9 +1,9 @@
|
||||
package com.baiye.auth.config;
|
||||
package com.baiye.config;
|
||||
|
||||
import com.baiye.auth.feign.IRemoteMemberService;
|
||||
import com.baiye.auth.sms.granter.SmsCodeTokenGranter;
|
||||
import com.baiye.auth.service.IOnlineUserService;
|
||||
import com.baiye.auth.translator.CustomWebRespExceptionTranslator;
|
||||
import com.baiye.feign.IRemoteMemberService;
|
||||
import com.baiye.service.IOnlineUserService;
|
||||
import com.baiye.sms.granter.SmsCodeTokenGranter;
|
||||
import com.baiye.translator.CustomWebRespExceptionTranslator;
|
||||
import com.baiye.core.constant.CacheKey;
|
||||
import com.baiye.core.constant.SecurityConstants;
|
||||
import com.baiye.core.util.RedisUtils;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.config;
|
||||
package com.baiye.config;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.jdbc.DataSourceBuilder;
|
@ -1,7 +1,6 @@
|
||||
package com.baiye.auth.config;
|
||||
package com.baiye.config;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.baiye.auth.service.IOnlineUserService;
|
||||
import com.baiye.service.IOnlineUserService;
|
||||
import com.baiye.component.LoginUser;
|
||||
import com.baiye.core.constant.SecurityConstants;
|
||||
import org.springframework.security.core.AuthenticationException;
|
@ -1,7 +1,7 @@
|
||||
package com.baiye.auth.controller;
|
||||
package com.baiye.controller;
|
||||
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import com.baiye.auth.service.ILogoutService;
|
||||
import com.baiye.service.ILogoutService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.HttpStatus;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.controller;
|
||||
package com.baiye.controller;
|
||||
|
||||
import com.baiye.core.annotation.Log;
|
||||
import com.baiye.core.base.api.Result;
|
@ -1,6 +1,6 @@
|
||||
package com.baiye.auth.controller;
|
||||
package com.baiye.controller;
|
||||
|
||||
import com.baiye.auth.service.IOnlineUserService;
|
||||
import com.baiye.service.IOnlineUserService;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Pageable;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.entity;
|
||||
package com.baiye.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.feign;
|
||||
package com.baiye.feign;
|
||||
|
||||
import com.baiye.core.constant.SecurityConstants;
|
||||
import com.baiye.core.constant.ServiceNameConstants;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.service;
|
||||
package com.baiye.service;
|
||||
|
||||
/**
|
||||
*
|
@ -1,6 +1,6 @@
|
||||
package com.baiye.auth.service;
|
||||
package com.baiye.service;
|
||||
|
||||
import com.baiye.auth.entity.OnlineUser;
|
||||
import com.baiye.entity.OnlineUser;
|
||||
import com.baiye.core.page.PageResult;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.security.oauth2.common.OAuth2AccessToken;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.service;
|
||||
package com.baiye.service;
|
||||
|
||||
/**
|
||||
* @author Enzo
|
@ -1,8 +1,8 @@
|
||||
package com.baiye.auth.service.impl;
|
||||
package com.baiye.service.impl;
|
||||
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import com.baiye.auth.service.ILogoutService;
|
||||
import com.baiye.auth.service.IOnlineUserService;
|
||||
import com.baiye.service.ILogoutService;
|
||||
import com.baiye.service.IOnlineUserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.oauth2.common.OAuth2AccessToken;
|
||||
import org.springframework.security.oauth2.provider.token.TokenStore;
|
@ -1,16 +1,15 @@
|
||||
package com.baiye.auth.service.impl;
|
||||
package com.baiye.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import com.baiye.auth.entity.OnlineUser;
|
||||
import com.baiye.auth.service.IOnlineUserService;
|
||||
import com.baiye.entity.OnlineUser;
|
||||
import com.baiye.service.IOnlineUserService;
|
||||
import com.baiye.core.constant.CacheKey;
|
||||
import com.baiye.core.constant.SecurityConstants;
|
||||
import com.baiye.core.page.PageResult;
|
||||
import com.baiye.core.page.PageUtil;
|
||||
import com.baiye.core.util.RedisUtils;
|
||||
import com.baiye.core.util.RequestUtils;
|
||||
import com.baiye.core.util.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
@ -1,15 +1,14 @@
|
||||
package com.baiye.auth.service.impl;
|
||||
package com.baiye.service.impl;
|
||||
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.aliyun.dysmsapi20170525.Client;
|
||||
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
|
||||
import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
|
||||
import com.aliyun.teaopenapi.models.Config;
|
||||
import com.aliyun.teautil.models.RuntimeOptions;
|
||||
import com.baiye.auth.config.properties.SmsProperties;
|
||||
import com.baiye.auth.service.SmsService;
|
||||
import com.baiye.config.properties.SmsProperties;
|
||||
import com.baiye.service.SmsService;
|
||||
import com.baiye.core.constant.DefaultNumberConstants;
|
||||
import com.baiye.core.constant.Oauth2Constant;
|
||||
import com.baiye.core.util.RedisUtils;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.sms;
|
||||
package com.baiye.sms;
|
||||
|
||||
import com.baiye.core.constant.Oauth2Constant;
|
||||
import org.springframework.security.authentication.AuthenticationServiceException;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.sms;
|
||||
package com.baiye.sms;
|
||||
|
||||
import com.baiye.service.CdpUserDetailsService;
|
||||
import lombok.AllArgsConstructor;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.sms;
|
||||
package com.baiye.sms;
|
||||
|
||||
import com.baiye.service.CdpUserDetailsService;
|
||||
import lombok.RequiredArgsConstructor;
|
@ -1,4 +1,4 @@
|
||||
package com.baiye.auth.sms;
|
||||
package com.baiye.sms;
|
||||
|
||||
import lombok.SneakyThrows;
|
||||
import org.springframework.security.authentication.AbstractAuthenticationToken;
|
@ -1,19 +1,18 @@
|
||||
package com.baiye.auth.sms.granter;
|
||||
package com.baiye.sms.granter;
|
||||
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import com.baiye.auth.feign.IRemoteMemberService;
|
||||
import com.baiye.auth.sms.SmsCodeAuthenticationToken;
|
||||
import com.baiye.feign.IRemoteMemberService;
|
||||
import com.baiye.sms.SmsCodeAuthenticationToken;
|
||||
import com.baiye.core.constant.Oauth2Constant;
|
||||
import com.baiye.core.constant.SecurityConstants;
|
||||
import com.baiye.core.util.RedisUtils;
|
||||
import com.baiye.exception.global.SmsAuthorizationException;
|
||||
import com.baiye.SmsAuthorizationException;
|
||||
import org.springframework.security.authentication.AbstractAuthenticationToken;
|
||||
import org.springframework.security.authentication.AccountStatusException;
|
||||
import org.springframework.security.authentication.AuthenticationManager;
|
||||
import org.springframework.security.authentication.BadCredentialsException;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
|
||||
import org.springframework.security.oauth2.common.exceptions.UserDeniedAuthorizationException;
|
||||
import org.springframework.security.oauth2.provider.*;
|
||||
import org.springframework.security.oauth2.provider.token.AbstractTokenGranter;
|
||||
import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
|
@ -1,6 +1,6 @@
|
||||
package com.baiye.auth.translator;
|
||||
package com.baiye.translator;
|
||||
|
||||
import com.baiye.exception.global.handle.ApiError;
|
||||
import com.baiye.handle.ApiError;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.http.HttpStatus;
|
Loading…
Reference in New Issue