增加短信登录方式 修改项目结构

master
bynt 2 years ago
parent 903d358002
commit 24cc5baef0

@ -66,5 +66,11 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
</dependencies>
</project>

@ -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;
}

@ -86,6 +86,11 @@ public enum ResultCode {
*
*/
USER_ACCOUNT_EXPIRED(11008, "用户账号已过期"),
/**
*
*/
NOT_LOGIN(20002, "未登录,请先登录"),
/**
*
*/
@ -325,6 +330,11 @@ public enum ResultCode {
*/
SAVE_MEMBER_ERROR(1020, "保存会员失败"),
/**
* token
*/
TOKEN_INVALID(10103, "invalid access token"),
GET_CONTACT_ERROR(1013, "获取通讯录信息错误"),

@ -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;
}
}
}

@ -3,7 +3,13 @@ package com.baiye.core.util;
import cn.hutool.core.util.IdUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONObject;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* IP
@ -38,7 +44,8 @@ public class IPUtil {
}
public static void main(String[] args) {
String uuid = IdUtil.randomUUID();
System.out.println(uuid);
ArrayList<String> strings = Lists.newArrayList("", "1");
List<String> collect = strings.stream().filter(s -> StringUtils.isNotBlank(s)).collect(Collectors.toList());
System.out.printf("");
}
}

@ -0,0 +1,92 @@
package com.baiye.core.util;
import org.apache.commons.lang3.StringUtils;
import java.util.regex.Pattern;
/**
* @author Enzo
* @date : 2022/4/18
*/
public class MobileUtil {
/**
* 133,149,153,173,177,180,181,189,191,199,1349,1410,1700,1701,1702,193
**/
private static final String CHINA_TELECOM_PATTERN = "(?:^(?:\\+86)?1(?:33|49|53|7[37]|8[019]|9[139])\\d{8}$)|(?:^(?:\\+86)?1349\\d{7}$)|(?:^(?:\\+86)?1410\\d{7}$)|(?:^(?:\\+86)?170[0-2]\\d{7}$)";
/**
* 130,131,132,145,146,155,156,166,171,175,176,185,186,1704,1707,1708,1709
**/
private static final String CHINA_UNICOM_PATTERN = "(?:^(?:\\+86)?1(?:3[0-2]|4[56]|5[56]|66|7[156]|8[56])\\d{8}$)|(?:^(?:\\+86)?170[47-9]\\d{7}$)";
/**
*
* 134,135,136,137,138,139,147,148,150,151,152,157,158,159,178,182,183,184,187,188,195,198,1440,1703,1705,1706
**/
private static final String CHINA_MOBILE_PATTERN = "(?:^(?:\\+86)?1(?:3[4-9]|4[78]|5[0-27-9]|6[5]|7[28]|8[2-478]|98|95)\\d{8}$)|(?:^(?:\\+86)?1440\\d{7}$)|(?:^(?:\\+86)?170[356]\\d{7}$)";
/**
*
*
* @param phone
* @return
*/
public static boolean checkPhone(String phone) {
if (StringUtils.isNotBlank(phone)) {
if (checkChinaMobile(phone) || checkChinaUnicom(phone) || checkChinaTelecom(phone)) {
return true;
}
}
return false;
}
/**
*
*
* @param phone
* @return
*/
public static boolean checkChinaMobile(String phone) {
if (StringUtils.isNotBlank(phone)) {
Pattern regexp = Pattern.compile(CHINA_MOBILE_PATTERN);
return regexp.matcher(phone).matches();
}
return false;
}
/**
*
*
* @param phone
* @return
*/
public static boolean checkChinaUnicom(String phone) {
if (StringUtils.isNotBlank(phone)) {
Pattern regexp = Pattern.compile(CHINA_UNICOM_PATTERN);
if (regexp.matcher(phone).matches()) {
return true;
}
}
return false;
}
/**
*
*
* @param phone
* @return
*/
public static boolean checkChinaTelecom(String phone) {
if (StringUtils.isNotBlank(phone)) {
Pattern regexp = Pattern.compile(CHINA_TELECOM_PATTERN);
if (regexp.matcher(phone).matches()) {
return true;
}
}
return false;
}
}

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.baiye.exception.global;
package com.baiye;
/**
*

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.baiye.exception.global;
package com.baiye;
import lombok.Getter;
import org.springframework.http.HttpStatus;

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.baiye.exception.global;
package com.baiye;
import org.springframework.util.StringUtils;

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.baiye.exception.global;
package com.baiye;
import org.springframework.util.StringUtils;

@ -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();
}
}

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.baiye.exception.global.handle;
package com.baiye.handle;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.baiye.exception.global.handle;
package com.baiye.handle;
import com.baiye.*;
import com.baiye.core.util.ThrowableUtil;
import com.baiye.exception.global.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.BadCredentialsException;
@ -36,7 +37,7 @@ import static org.springframework.http.HttpStatus.NOT_MODIFIED;
* @date 2018-11-23
*/
@Slf4j
@RestControllerAdvice(basePackages = "com.baiye")
@RestControllerAdvice
public class GlobalExceptionHandler {
/**
@ -145,13 +146,36 @@ public class GlobalExceptionHandler {
public ResponseEntity<ApiError> smsException(SmsAuthorizationException e) {
// 打印堆栈信息
log.error(ThrowableUtil.getStackTrace(e));
return buildResponseEntity(ApiError.error(NOT_MODIFIED.value(), e.getMessage()));
return buildResponseEntity(ApiError.error(e.getMessage()));
}
/**
* Exception
*
* @param ex Exception
* @return Result
*/
@ExceptionHandler(Exception.class)
public ResponseEntity<?> handleException(Exception ex) {
log.error("程序异常:" + ex.toString());
String message = ex.getMessage();
if (StringUtils.contains(message, "Bad credentials")) {
message = "用户名或密码不正确!";
} else if (StringUtils.contains(ex.toString(), "InternalAuthenticationServiceException")) {
message = "您输入的用户名不存在!";
}
return buildResponseEntity(ApiError.error(message));
}
/**
*
*/
private ResponseEntity<ApiError> buildResponseEntity(ApiError apiError) {
return new ResponseEntity<>(apiError, HttpStatus.valueOf(apiError.getStatus()));
}
}

@ -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,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

@ -7,14 +7,13 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baiye.core.base.api.Result;
import com.baiye.core.constant.HttpStatus;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.feign.WeChatClient;
import com.baiye.service.FileUploadService;
import com.baiye.utils.FilePathUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;

@ -63,7 +63,6 @@
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dysmsapi20170525</artifactId>
<version>2.0.23</version>
</dependency>
</dependencies>
@ -76,7 +75,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.baiye.auth.AuthApplication</mainClass>
<mainClass>com.baiye.AuthApplication</mainClass>
<layout>ZIP</layout>
</configuration>
<executions>

@ -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,6 @@
package com.baiye.auth.config;
package com.baiye.config;
import com.baiye.auth.sms.SmsCodeAuthenticationSecurityConfig;
import com.baiye.config.IgnoreUrlPropsConfiguration;
import com.baiye.sms.SmsCodeAuthenticationSecurityConfig;
import com.baiye.handle.CustomAuthenticationFailureHandler;
import com.baiye.service.UserDetailsServiceImpl;
import lombok.RequiredArgsConstructor;
@ -72,7 +71,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.apply(smsCodeAuthenticationSecurityConfig)
.and()
.authorizeRequests();
config.antMatchers("/actuator/**", "/oauth/**", "/auth/**", "/token/**").permitAll();
config.antMatchers("/actuator/**", "/oauth/**", "/auth/**", "/token/**","/sms/getCode").permitAll();
ignoreUrlPropsConfig.getUrls().forEach(url -> config.antMatchers(url).permitAll());
ignoreUrlPropsConfig.getIgnoreSecurity().forEach(url -> config.antMatchers(url).permitAll());
config

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.baiye.auth.config.properties;
package com.baiye.config.properties;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
*/
@Data
@Configuration
@ConfigurationProperties(prefix = "sms")
@ConfigurationProperties(prefix = "sms.aliyun")
public class SmsProperties {
@ApiModelProperty(value = "accessKeyId")

@ -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,7 +1,8 @@
package com.baiye.auth.controller;
package com.baiye.controller;
import com.baiye.auth.service.SmsService;
import com.baiye.service.SmsService;
import com.baiye.core.base.api.Result;
import com.baiye.core.util.MobileUtil;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
@ -22,7 +23,8 @@ public class SmsController {
@GetMapping("/getCode")
@ResponseBody
public Result<String> sendSMS(@RequestParam String mobile) {
if (StringUtils.isBlank(mobile)) {
int i = 10 / 0;
if (StringUtils.isBlank(mobile) || !MobileUtil.checkPhone(mobile)) {
return Result.fail("发送短信失败");
}
return Boolean.TRUE.equals(smsService.sendSms(mobile)) ? Result.success() : Result.fail();

@ -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,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,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;

@ -4,6 +4,15 @@ spring:
application:
name: auth-server
profiles:
active: prod
active: dev
ip:
local-parsing: true
#配置短信参数
sms:
aliyun:
accessKeyId: R7hb84lBwjJQasch
accessKeySecret: 2ngpjkzXBKHPZhVj2yDZSGVX3fXAwT
signName: 百业互联科技
templateCode: SMS_232894146
templateCode1: SMS_243261646

@ -3,7 +3,7 @@ package com.baiye.controller;
import com.baiye.Dept;
import com.baiye.core.page.PageResult;
import com.baiye.dto.DeptDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.query.DeptQueryCriteria;
import com.baiye.service.IDeptService;
import io.swagger.annotations.Api;

@ -2,7 +2,7 @@ package com.baiye.controller;
import com.baiye.Dict;
import com.baiye.core.page.PageResult;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.query.DictQueryCriteria;
import com.baiye.service.IDictService;
import io.swagger.annotations.Api;

@ -3,7 +3,7 @@ package com.baiye.controller;
import com.baiye.DictDetail;
import com.baiye.core.page.PageResult;
import com.baiye.dto.DictDetailDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.query.DictDetailQueryCriteria;
import com.baiye.service.IDictDetailService;
import io.swagger.annotations.Api;

@ -2,7 +2,7 @@ package com.baiye.controller;
import com.baiye.Job;
import com.baiye.core.page.PageResult;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.query.JobQueryCriteria;
import com.baiye.service.IJobService;
import io.swagger.annotations.Api;

@ -1,11 +1,10 @@
package com.baiye.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.baiye.Menu;
import com.baiye.core.page.PageResult;
import com.baiye.dto.MenuDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.mapstruct.MenuMapStruct;
import com.baiye.query.MenuQueryCriteria;
import com.baiye.service.IMenuService;

@ -1,7 +1,7 @@
package com.baiye.controller;
import cn.hutool.core.text.CharSequenceUtil;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.properties.FileProperties;
import com.baiye.util.FileUtil;
import com.google.common.collect.ImmutableMap;
@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.Objects;
/**
* @author Enzo

@ -5,7 +5,7 @@ import com.baiye.Role;
import com.baiye.core.page.PageResult;
import com.baiye.dto.RoleDto;
import com.baiye.dto.RoleSmallDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.query.RoleQueryCriteria;
import com.baiye.service.IRoleService;
import com.baiye.util.SecurityUtils;

@ -5,7 +5,7 @@ import com.baiye.core.base.BaseEntity;
import com.baiye.core.page.PageResult;
import com.baiye.dto.RoleSmallDto;
import com.baiye.dto.UserDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.query.UserQueryCriteria;
import com.baiye.service.*;
import com.baiye.util.SecurityUtils;

@ -12,8 +12,8 @@ import com.baiye.core.util.BeanUtils;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.DeptDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.exception.global.CreateFailException;
import com.baiye.BadRequestException;
import com.baiye.CreateFailException;
import com.baiye.mapper.DeptMapper;
import com.baiye.mapper.RoleDeptMapper;
import com.baiye.mapper.UserMapper;

@ -7,7 +7,7 @@ import com.baiye.core.page.PageResult;
import com.baiye.core.util.RedisUtils;
import com.baiye.core.util.StringUtils;
import com.baiye.dto.DictDetailDto;
import com.baiye.exception.global.DeleteFailException;
import com.baiye.DeleteFailException;
import com.baiye.mapper.DictDetailMapper;
import com.baiye.mapper.DictMapper;
import com.baiye.mapstruct.DictDetailMapStruct;

@ -6,8 +6,8 @@ import com.baiye.core.page.PageResult;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.DictDto;
import com.baiye.exception.global.CreateFailException;
import com.baiye.exception.global.UpdateFailException;
import com.baiye.CreateFailException;
import com.baiye.UpdateFailException;
import com.baiye.mapper.DictDetailMapper;
import com.baiye.mapper.DictMapper;
import com.baiye.mapstruct.DictMapStruct;

@ -7,10 +7,10 @@ import com.baiye.core.page.PageResult;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.JobDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.exception.global.CreateFailException;
import com.baiye.exception.global.DeleteFailException;
import com.baiye.exception.global.EntityExistException;
import com.baiye.BadRequestException;
import com.baiye.CreateFailException;
import com.baiye.DeleteFailException;
import com.baiye.EntityExistException;
import com.baiye.mapper.JobMapper;
import com.baiye.mapper.UserJobMapper;
import com.baiye.mapstruct.JobMapStruct;

@ -10,8 +10,8 @@ import com.baiye.core.constant.CacheKey;
import com.baiye.core.page.PageResult;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.UserSmallDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.exception.global.UpdateFailException;
import com.baiye.BadRequestException;
import com.baiye.UpdateFailException;
import com.baiye.feign.IRemoteAuthService;
import com.baiye.mapper.MemberMapper;
import com.baiye.mapstruct.MemberMapStruct;

@ -2,10 +2,6 @@ package com.baiye.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baiye.Menu;
import com.baiye.Role;
import com.baiye.User;
@ -13,12 +9,11 @@ import com.baiye.core.constant.CacheKey;
import com.baiye.core.page.PageResult;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
import com.baiye.core.util.RequestUtils;
import com.baiye.core.util.StringUtils;
import com.baiye.dto.MenuDto;
import com.baiye.exception.global.BadRequestException;
import com.baiye.exception.global.EntityExistException;
import com.baiye.exception.global.UpdateFailException;
import com.baiye.BadRequestException;
import com.baiye.EntityExistException;
import com.baiye.UpdateFailException;
import com.baiye.mapper.MenuMapper;
import com.baiye.mapper.UserMapper;
import com.baiye.mapstruct.MenuMapStruct;

@ -9,7 +9,6 @@ import com.baiye.core.util.RedisUtils;
import com.baiye.dto.RoleDto;
import com.baiye.dto.RoleSmallDto;
import com.baiye.dto.UserDto;
import com.baiye.exception.global.*;
import com.baiye.mapper.*;
import com.baiye.mapstruct.RoleMapStruct;
import com.baiye.mapstruct.RoleSmallMapStruct;

@ -14,7 +14,6 @@ import com.baiye.core.util.RedisUtils;
import com.baiye.core.util.StringUtils;
import com.baiye.dto.UserDto;
import com.baiye.dto.UserSmallDto;
import com.baiye.exception.global.*;
import com.baiye.feign.IRemoteAuthService;
import com.baiye.mapper.UserJobMapper;
import com.baiye.mapper.UserMapper;

@ -19,7 +19,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@ -9,7 +9,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: prod
active: dev
jackson:
time-zone: GMT+8
data:

@ -8,7 +8,7 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baiye.core.base.api.BaseTiktokRequest;
import com.baiye.core.base.api.BaseTiktokResponse;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.properties.TiktokProperties;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;

@ -14,7 +14,7 @@ import com.baiye.core.util.AesEncrypt;
import com.baiye.dto.*;
import com.baiye.dto.request.OptCommentVideoRequestDTO;
import com.baiye.dto.request.SendMessageRequestDTO;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.feign.TikTokUserFeignProvider;
import com.baiye.service.BaseSocketServerHandler;
import io.netty.buffer.ByteBuf;

@ -18,7 +18,7 @@ import com.baiye.dao.*;
import com.baiye.dto.HotCommentSopDto;
import com.baiye.dto.VideoDto;
import com.baiye.entity.*;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.service.TiktokHotCommentSopService;
import com.baiye.service.TiktokNumOrganizeService;
import com.baiye.service.TiktokUserService;

@ -6,7 +6,7 @@ import com.baiye.core.util.StringUtils;
import com.baiye.entity.TiktokMaterialEntity;
import com.baiye.dao.TiktokMaterialMapper;
import com.baiye.entity.TiktokMaterialTemplateEntity;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.properties.FileProperties;
import com.baiye.service.TiktokMaterialService;
import com.baiye.service.TiktokMaterialTemplateService;

@ -2,9 +2,7 @@ package com.baiye.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.RandomUtil;
import com.baiye.constant.DefaultKeyConstants;
import com.baiye.core.constant.DefaultNumberConstants;
import com.baiye.core.page.PageResult;
import com.baiye.core.util.StringUtils;
import com.baiye.dao.SopMapper;
@ -15,7 +13,7 @@ import com.baiye.entity.TiktokEquipmentEntity;
import com.baiye.entity.TiktokHotCommentSopEntity;
import com.baiye.entity.TiktokNumOrganizeEntity;
import com.baiye.dao.TiktokNumOrganizeMapper;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.service.TiktokNumOrganizeService;
import com.baiye.service.TiktokEquipmentService;
import com.baiye.vo.SopVo;

@ -8,7 +8,6 @@ import cn.hutool.core.util.RandomUtil;
import com.baiye.api.TiktokRequestClient;
import com.baiye.api.request.*;
import com.baiye.api.response.*;
import com.baiye.core.base.api.BaseTiktokResponse;
import com.baiye.core.base.api.Result;
import com.baiye.core.base.api.ResultCode;
import com.baiye.core.constant.DefaultNumberConstants;
@ -19,7 +18,7 @@ import com.baiye.dto.TiktokMemberDTO;
import com.baiye.dto.request.*;
import com.baiye.entity.TiktokEquipmentEntity;
import com.baiye.entity.TiktokVideoComment;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.properties.TiktokProperties;
import com.baiye.service.TiktokEquipmentService;
import com.baiye.service.TiktokMemberService;

@ -19,7 +19,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@ -8,7 +8,7 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baiye.core.base.api.BaseTiktokRequest;
import com.baiye.core.base.api.BaseTiktokResponse;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.properties.TiktokProperties;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;

@ -19,7 +19,7 @@ import com.baiye.core.util.DesUtil;
import com.baiye.dao.*;
import com.baiye.dto.*;
import com.baiye.entity.*;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.properties.WeChatProperties;
import com.baiye.query.WeChatUserQuery;
import com.baiye.service.WeChatUserService;

@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
import com.aliyun.oss.OSS;
import com.baiye.core.base.api.Result;
import com.baiye.core.constant.DefaultNumberConstants;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.oss.OssConfig;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;

@ -1,7 +1,7 @@
package com.baiye.controller;
import cn.hutool.core.text.CharSequenceUtil;
import com.baiye.exception.global.BadRequestException;
import com.baiye.BadRequestException;
import com.baiye.properties.FileProperties;
import com.baiye.util.FileUtil;
import com.google.common.collect.ImmutableMap;

@ -35,6 +35,7 @@
<!-- 定义版本 -->
<properties>
<java.version>1.8</java.version>
<sms.version>2.0.23</sms.version>
<oshi.version>5.2.3</oshi.version>
<guava.version>22.0</guava.version>
<okio.version>1.15.0</okio.version>
@ -305,6 +306,12 @@
<version>${webmagic.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dysmsapi20170525</artifactId>
<version>${sms.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Loading…
Cancel
Save