BJ_ZTEITS-Developers / parking-cloud-yudao

Commit a927dd059eb94c28316ac3cdde71359d8ab73e8d

Authored by YunaiV
1 parent eec8d12b

项目结构调整 x 18 : 解决拆分后的报错

Inline Side-by-side
Showing 127 changed files with 480 additions and 364 deletions
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java
  View file @a927dd0
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 -import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; 7 +import cn.iocoder.yudao.framework.quartz.core.util.CronUtils;
8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*; 8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*;
9 import cn.iocoder.dashboard.modules.infra.convert.job.InfJobConvert; 9 import cn.iocoder.dashboard.modules.infra.convert.job.InfJobConvert;
10 import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO; 10 import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.infra.dal.dataobject.job; 1 package cn.iocoder.dashboard.modules.infra.dal.dataobject.job;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 -import cn.iocoder.dashboard.framework.quartz.core.handler.JobHandler; 4 +import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
5 import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum; 5 import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import lombok.*; 7 import lombok.*;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.infra.dal.mysql.config; 1 package cn.iocoder.dashboard.modules.infra.dal.mysql.config;
2 2
3 -import cn.iocoder.dashboard.framework.apollo.internals.ConfigFrameworkDAO;  
4 -import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO;  
5 -import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; 3 +import cn.iocoder.yudao.framework.apollo.internals.ConfigFrameworkDAO;
  4 +import cn.iocoder.yudao.framework.apollo.internals.dto.ConfigRespDTO;
6 import org.springframework.jdbc.core.BeanPropertyRowMapper; 5 import org.springframework.jdbc.core.BeanPropertyRowMapper;
7 import org.springframework.jdbc.core.JdbcTemplate; 6 import org.springframework.jdbc.core.JdbcTemplate;
8 import org.springframework.jdbc.datasource.DriverManagerDataSource; 7 import org.springframework.jdbc.datasource.DriverManagerDataSource;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.infra.mq.consumer.config; 1 package cn.iocoder.dashboard.modules.infra.mq.consumer.config;
2 2
3 -import cn.iocoder.dashboard.framework.apollo.internals.DBConfigRepository; 3 +import cn.iocoder.yudao.framework.apollo.internals.DBConfigRepository;
4 import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener; 4 import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
5 import cn.iocoder.dashboard.modules.infra.mq.message.config.InfConfigRefreshMessage; 5 import cn.iocoder.dashboard.modules.infra.mq.message.config.InfConfigRefreshMessage;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.infra.service.job; 1 package cn.iocoder.dashboard.modules.infra.service.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.dashboard.framework.quartz.core.service.JobLogFrameworkService; 4 +import cn.iocoder.yudao.framework.quartz.core.service.JobLogFrameworkService;
5 import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; 5 import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;
6 import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; 6 import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;
7 import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; 7 import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.infra.service.job.impl; 1 package cn.iocoder.dashboard.modules.infra.service.job.impl;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager;  
5 -import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; 4 +import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
  5 +import cn.iocoder.yudao.framework.quartz.core.util.CronUtils;
6 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; 6 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO;
7 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; 7 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO;
8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO; 8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java
  View file @a927dd0
@@ -4,7 +4,7 @@ import cn.hutool.core.util.URLUtil; @@ -4,7 +4,7 @@ import cn.hutool.core.util.URLUtil;
4 import cn.hutool.extra.servlet.ServletUtil; 4 import cn.hutool.extra.servlet.ServletUtil;
5 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; 7 +import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum;
8 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; 8 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService;
9 import io.swagger.annotations.Api; 9 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiImplicitParam; 10 import io.swagger.annotations.ApiImplicitParam;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.system.convert.sms; 1 package cn.iocoder.dashboard.modules.system.convert.sms;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 4 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
5 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; 5 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO;
6 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelRespVO; 6 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelRespVO;
7 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelSimpleRespVO; 7 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelSimpleRespVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java
  View file @a927dd0
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.sms;
2 2
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
5 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; 5 +import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java
  View file @a927dd0
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.sms;
2 2
3 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 3 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
5 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; 5 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
6 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum; 6 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum;
7 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsSendStatusEnum; 7 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsSendStatusEnum;
8 import com.baomidou.mybatisplus.annotation.TableField; 8 import com.baomidou.mybatisplus.annotation.TableField;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/job/auth/SysUserSessionTimeoutJob.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.system.job.auth; 1 package cn.iocoder.dashboard.modules.system.job.auth;
2 2
3 -import cn.iocoder.dashboard.framework.quartz.core.handler.JobHandler; 3 +import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
4 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; 4 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
5 import lombok.extern.slf4j.Slf4j; 5 import lombok.extern.slf4j.Slf4j;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
  View file @a927dd0
@@ -18,6 +18,7 @@ import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionServi @@ -18,6 +18,7 @@ import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionServi
18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
19 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; 19 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
20 import lombok.extern.slf4j.Slf4j; 20 import lombok.extern.slf4j.Slf4j;
  21 +import org.springframework.context.annotation.Lazy;
21 import org.springframework.security.authentication.AuthenticationManager; 22 import org.springframework.security.authentication.AuthenticationManager;
22 import org.springframework.security.authentication.BadCredentialsException; 23 import org.springframework.security.authentication.BadCredentialsException;
23 import org.springframework.security.authentication.DisabledException; 24 import org.springframework.security.authentication.DisabledException;
@@ -46,6 +47,7 @@ import static java.util.Collections.singleton; @@ -46,6 +47,7 @@ import static java.util.Collections.singleton;
46 public class SysAuthServiceImpl implements SysAuthService { 47 public class SysAuthServiceImpl implements SysAuthService {
47 48
48 @Resource 49 @Resource
  50 + @Lazy // 延迟加载，因为存在相互依赖的问题
49 private AuthenticationManager authenticationManager; 51 private AuthenticationManager authenticationManager;
50 @Resource 52 @Resource
51 private SysUserService userService; 53 private SysUserService userService;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java
  View file @a927dd0
@@ -3,8 +3,8 @@ package cn.iocoder.dashboard.modules.system.service.sms.impl; @@ -3,8 +3,8 @@ package cn.iocoder.dashboard.modules.system.service.sms.impl;
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 5 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
6 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory;  
7 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 6 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
  7 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
8 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO;
9 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO; 9 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO;
10 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO; 10 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java
  View file @a927dd0
@@ -5,11 +5,11 @@ import cn.hutool.core.util.StrUtil; @@ -5,11 +5,11 @@ import cn.hutool.core.util.StrUtil;
5 import cn.iocoder.yudao.framework.common.core.KeyValue; 5 import cn.iocoder.yudao.framework.common.core.KeyValue;
6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 7 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
8 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClient;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
11 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
12 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; 8 +import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
  9 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
  10 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  11 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  12 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
13 import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO; 13 import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO;
14 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; 14 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
15 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage; 15 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java
  View file @a927dd0
@@ -6,10 +6,10 @@ import cn.hutool.core.util.StrUtil; @@ -6,10 +6,10 @@ import cn.hutool.core.util.StrUtil;
6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 8 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
9 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClient;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory;  
11 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
12 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; 9 +import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
  10 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
  11 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  12 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
13 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO; 13 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO;
14 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO; 14 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO;
15 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplatePageReqVO; 15 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplatePageReqVO;
yudao-admin-server/src/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector deleted
View file @eec8d12
1 -cn.iocoder.dashboard.framework.apollo.internals.DefaultXInjector  
yudao-admin-server/src/main/resources/META-INF/spring.factories deleted
View file @eec8d12
1 -org.springframework.boot.env.EnvironmentPostProcessor=\  
2 - cn.iocoder.dashboard.framework.apollo.spring.boot.ApolloApplicationContextInitializer  
yudao-admin-server/src/main/resources/application.yaml
  View file @a927dd0
@@ -40,3 +40,5 @@ yudao: @@ -40,3 +40,5 @@ yudao:
40 constants-class-list: 40 constants-class-list:
41 - cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants 41 - cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants
42 - cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants 42 - cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants
  43 +
  44 +debug: false
yudao-admin-server/src/main/resources/1logback-spring.xml renamed to yudao-admin-server/src/main/resources/logback-spring.xml
  View file @a927dd0
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseDbAndRedisIntegrationTest.java
  View file @a927dd0
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard;
2 2
3 import cn.iocoder.yudao.framework.datasource.config.DataSourceConfiguration; 3 import cn.iocoder.yudao.framework.datasource.config.DataSourceConfiguration;
4 import cn.iocoder.yudao.framework.mybatis.config.MybatisConfiguration; 4 import cn.iocoder.yudao.framework.mybatis.config.MybatisConfiguration;
5 -import cn.iocoder.yudao.framework.redis.config.RedisConfig; 5 +import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
6 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; 6 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
7 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; 7 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
8 import org.redisson.spring.starter.RedissonAutoConfiguration; 8 import org.redisson.spring.starter.RedissonAutoConfiguration;
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseRedisIntegrationTest.java
  View file @a927dd0
1 package cn.iocoder.dashboard; 1 package cn.iocoder.dashboard;
2 2
3 -import cn.iocoder.yudao.framework.redis.config.RedisConfig; 3 +import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
4 import org.redisson.spring.starter.RedissonAutoConfiguration; 4 import org.redisson.spring.starter.RedissonAutoConfiguration;
5 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; 5 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
6 import org.springframework.boot.test.context.SpringBootTest; 6 import org.springframework.boot.test.context.SpringBootTest;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java
  View file @a927dd0
1 package cn.iocoder.dashboard; 1 package cn.iocoder.dashboard;
2 2
3 import cn.iocoder.dashboard.config.RedisTestConfiguration; 3 import cn.iocoder.dashboard.config.RedisTestConfiguration;
4 -import cn.iocoder.yudao.framework.redis.config.RedisConfig; 4 +import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
5 import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; 5 import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
6 import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; 6 import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
7 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; 7 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
@@ -39,7 +39,7 @@ public class BaseDbAndRedisUnitTest { @@ -39,7 +39,7 @@ public class BaseDbAndRedisUnitTest {
39 // Redis 配置类 39 // Redis 配置类
40 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer 40 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer
41 RedisAutoConfiguration.class, // Spring Redis 自动配置类 41 RedisAutoConfiguration.class, // Spring Redis 自动配置类
42 - RedisConfig.class, // 自己的 Redis 配置类 42 + YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类
43 RedissonAutoConfiguration.class, // Redisson 自动高配置类 43 RedissonAutoConfiguration.class, // Redisson 自动高配置类
44 }) 44 })
45 public static class Application { 45 public static class Application {
yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseRedisUnitTest.java
  View file @a927dd0
1 package cn.iocoder.dashboard; 1 package cn.iocoder.dashboard;
2 2
3 import cn.iocoder.dashboard.config.RedisTestConfiguration; 3 import cn.iocoder.dashboard.config.RedisTestConfiguration;
4 -import cn.iocoder.yudao.framework.redis.config.RedisConfig; 4 +import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
  5 +import cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration;
5 import org.redisson.spring.starter.RedissonAutoConfiguration; 6 import org.redisson.spring.starter.RedissonAutoConfiguration;
6 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; 7 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
7 import org.springframework.boot.test.context.SpringBootTest; 8 import org.springframework.boot.test.context.SpringBootTest;
@@ -23,7 +24,7 @@ public class BaseRedisUnitTest { @@ -23,7 +24,7 @@ public class BaseRedisUnitTest {
23 // Redis 配置类 24 // Redis 配置类
24 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer 25 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer
25 RedisAutoConfiguration.class, // Spring Redis 自动配置类 26 RedisAutoConfiguration.class, // Spring Redis 自动配置类
26 - RedisConfig.class, // 自己的 Redis 配置类 27 + YudaoTracerAutoConfiguration.class, // 自己的 Redis 配置类
27 RedissonAutoConfiguration.class, // Redisson 自动高配置类 28 RedissonAutoConfiguration.class, // Redisson 自动高配置类
28 }) 29 })
29 public static class Application { 30 public static class Application {
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java
  View file @a927dd0
@@ -23,10 +23,10 @@ import java.util.function.Consumer; @@ -23,10 +23,10 @@ import java.util.function.Consumer;
23 23
24 import static cn.hutool.core.util.RandomUtil.randomEle; 24 import static cn.hutool.core.util.RandomUtil.randomEle;
25 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; 25 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*;
26 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
27 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
28 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 26 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  27 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
29 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 28 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  29 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
30 import static org.junit.jupiter.api.Assertions.*; 30 import static org.junit.jupiter.api.Assertions.*;
31 import static org.mockito.Mockito.times; 31 import static org.mockito.Mockito.times;
32 import static org.mockito.Mockito.verify; 32 import static org.mockito.Mockito.verify;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java
  View file @a927dd0
@@ -14,12 +14,12 @@ import org.springframework.context.annotation.Import; @@ -14,12 +14,12 @@ import org.springframework.context.annotation.Import;
14 14
15 import javax.annotation.Resource; 15 import javax.annotation.Resource;
16 16
17 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 17 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
18 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; 18 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS;
19 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; 19 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS;
20 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
21 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo;  
22 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 20 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  21 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
  22 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
23 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 23 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
24 import static org.junit.jupiter.api.Assertions.*; 24 import static org.junit.jupiter.api.Assertions.*;
25 25
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.infra.service.job; 1 package cn.iocoder.dashboard.modules.infra.service.job;
2 2
3 import static cn.hutool.core.util.RandomUtil.randomEle; 3 import static cn.hutool.core.util.RandomUtil.randomEle;
4 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
5 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;  
6 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo;  
7 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 4 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  5 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
  6 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
  7 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
8 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 8 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
9 import static org.junit.jupiter.api.Assertions.assertEquals; 9 import static org.junit.jupiter.api.Assertions.assertEquals;
10 import static org.junit.jupiter.api.Assertions.assertNotNull; 10 import static org.junit.jupiter.api.Assertions.assertNotNull;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java
  View file @a927dd0
@@ -7,10 +7,10 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB @@ -7,10 +7,10 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB
7 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS; 7 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS;
8 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS; 8 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS;
9 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS; 9 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS;
10 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
11 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
12 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo;  
13 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 10 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  11 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  12 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
  13 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
14 import static org.junit.jupiter.api.Assertions.assertEquals; 14 import static org.junit.jupiter.api.Assertions.assertEquals;
15 import static org.junit.jupiter.api.Assertions.assertNotNull; 15 import static org.junit.jupiter.api.Assertions.assertNotNull;
16 import static org.junit.jupiter.api.Assertions.assertNull; 16 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import; @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import;
30 30
31 import cn.iocoder.dashboard.BaseDbUnitTest; 31 import cn.iocoder.dashboard.BaseDbUnitTest;
32 import cn.iocoder.yudao.framework.common.pojo.PageResult; 32 import cn.iocoder.yudao.framework.common.pojo.PageResult;
33 -import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager; 33 +import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
34 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; 34 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO;
35 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; 35 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO;
36 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO; 36 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java
  View file @a927dd0
@@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfA @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfA
11 import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 11 import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
12 import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper; 12 import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper;
13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; 13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl;
14 -import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 14 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
15 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 15 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.context.annotation.Import; 17 import org.springframework.context.annotation.Import;
@@ -21,7 +21,7 @@ import java.util.Date; @@ -21,7 +21,7 @@ import java.util.Date;
21 import java.util.List; 21 import java.util.List;
22 import java.util.concurrent.Future; 22 import java.util.concurrent.Future;
23 23
24 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 24 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
25 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 25 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
26 import static org.junit.jupiter.api.Assertions.assertEquals; 26 import static org.junit.jupiter.api.Assertions.assertEquals;
27 import static org.junit.jupiter.api.Assertions.assertNotNull; 27 import static org.junit.jupiter.api.Assertions.assertNotNull;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java
  View file @a927dd0
@@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO
11 import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper; 11 import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper;
12 import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; 12 import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum;
13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; 13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl;
14 -import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 14 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
15 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 15 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.context.annotation.Import; 17 import org.springframework.context.annotation.Import;
@@ -23,8 +23,8 @@ import java.util.concurrent.Future; @@ -23,8 +23,8 @@ import java.util.concurrent.Future;
23 23
24 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; 24 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;
25 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; 25 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED;
26 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
27 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 26 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  27 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
28 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 28 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
29 import static org.junit.jupiter.api.Assertions.assertEquals; 29 import static org.junit.jupiter.api.Assertions.assertEquals;
30 import static org.junit.jupiter.api.Assertions.assertNotNull; 30 import static org.junit.jupiter.api.Assertions.assertNotNull;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java
  View file @a927dd0
@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService;
12 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; 12 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService;
13 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 13 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
14 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 14 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
15 -import cn.iocoder.dashboard.framework.test.core.util.AssertUtils; 15 +import cn.iocoder.yudao.framework.test.core.util.AssertUtils;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.boot.test.mock.mockito.MockBean; 17 import org.springframework.boot.test.mock.mockito.MockBean;
18 import org.springframework.context.annotation.Import; 18 import org.springframework.context.annotation.Import;
@@ -28,8 +28,8 @@ import javax.annotation.Resource; @@ -28,8 +28,8 @@ import javax.annotation.Resource;
28 import java.util.Set; 28 import java.util.Set;
29 29
30 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 30 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
31 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
32 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 31 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  32 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
33 import static java.util.Collections.singleton; 33 import static java.util.Collections.singleton;
34 import static org.junit.jupiter.api.Assertions.*; 34 import static org.junit.jupiter.api.Assertions.*;
35 import static org.mockito.ArgumentMatchers.eq; 35 import static org.mockito.ArgumentMatchers.eq;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java
  View file @a927dd0
1 package cn.iocoder.dashboard.modules.system.service.auth; 1 package cn.iocoder.dashboard.modules.system.service.auth;
2 2
3 import static cn.hutool.core.util.RandomUtil.randomEle; 3 import static cn.hutool.core.util.RandomUtil.randomEle;
4 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
5 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomDate;  
6 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;  
7 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo;  
8 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 4 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  5 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomDate;
  6 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
  7 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
  8 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
9 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime; 9 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime;
10 import static org.junit.jupiter.api.Assertions.assertEquals; 10 import static org.junit.jupiter.api.Assertions.assertEquals;
11 import static org.junit.jupiter.api.Assertions.assertNotEquals; 11 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -42,8 +42,8 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi @@ -42,8 +42,8 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi
42 import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; 42 import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl;
43 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; 43 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl;
44 import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; 44 import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl;
45 -import cn.iocoder.dashboard.framework.test.core.util.AssertUtils;  
46 -import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 45 +import cn.iocoder.yudao.framework.test.core.util.AssertUtils;
  46 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
47 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 47 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
48 48
49 /** 49 /**
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java
  View file @a927dd0
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Import; @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Import;
10 10
11 import javax.annotation.Resource; 11 import javax.annotation.Resource;
12 12
13 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 13 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
14 import static org.junit.jupiter.api.Assertions.*; 14 import static org.junit.jupiter.api.Assertions.*;
15 15
16 @Import({SysCaptchaServiceImpl.class, CaptchaProperties.class, SysCaptchaRedisDAO.class}) 16 @Import({SysCaptchaServiceImpl.class, CaptchaProperties.class, SysCaptchaRedisDAO.class})
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java
  View file @a927dd0
@@ -26,9 +26,9 @@ import java.util.function.Consumer; @@ -26,9 +26,9 @@ import java.util.function.Consumer;
26 import static cn.hutool.core.bean.BeanUtil.getFieldValue; 26 import static cn.hutool.core.bean.BeanUtil.getFieldValue;
27 import static cn.hutool.core.util.RandomUtil.randomEle; 27 import static cn.hutool.core.util.RandomUtil.randomEle;
28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
29 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
30 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
31 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 29 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  30 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  31 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
32 import static org.junit.jupiter.api.Assertions.*; 32 import static org.junit.jupiter.api.Assertions.*;
33 import static org.mockito.Mockito.times; 33 import static org.mockito.Mockito.times;
34 import static org.mockito.Mockito.verify; 34 import static org.mockito.Mockito.verify;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java
  View file @a927dd0
@@ -21,10 +21,10 @@ import java.util.function.Consumer; @@ -21,10 +21,10 @@ import java.util.function.Consumer;
21 21
22 import static cn.hutool.core.util.RandomUtil.randomEle; 22 import static cn.hutool.core.util.RandomUtil.randomEle;
23 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 23 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
24 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
25 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
26 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;  
27 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; 24 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  25 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  26 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
  27 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
28 import static org.junit.jupiter.api.Assertions.*; 28 import static org.junit.jupiter.api.Assertions.*;
29 29
30 /** 30 /**
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java
  View file @a927dd0
@@ -26,9 +26,9 @@ import java.util.function.Consumer; @@ -26,9 +26,9 @@ import java.util.function.Consumer;
26 26
27 import static cn.hutool.core.bean.BeanUtil.getFieldValue; 27 import static cn.hutool.core.bean.BeanUtil.getFieldValue;
28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
29 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
30 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
31 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 29 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  30 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  31 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
32 import static org.junit.jupiter.api.Assertions.*; 32 import static org.junit.jupiter.api.Assertions.*;
33 import static org.mockito.ArgumentMatchers.eq; 33 import static org.mockito.ArgumentMatchers.eq;
34 import static org.mockito.Mockito.*; 34 import static org.mockito.Mockito.*;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java
  View file @a927dd0
@@ -22,10 +22,10 @@ import java.util.function.Consumer; @@ -22,10 +22,10 @@ import java.util.function.Consumer;
22 22
23 import static cn.hutool.core.util.RandomUtil.randomEle; 23 import static cn.hutool.core.util.RandomUtil.randomEle;
24 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 24 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
25 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
26 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
27 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 25 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  26 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
28 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 27 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  28 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
29 import static org.junit.jupiter.api.Assertions.*; 29 import static org.junit.jupiter.api.Assertions.*;
30 import static org.mockito.ArgumentMatchers.eq; 30 import static org.mockito.ArgumentMatchers.eq;
31 import static org.mockito.Mockito.when; 31 import static org.mockito.Mockito.when;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java
  View file @a927dd0
@@ -27,10 +27,10 @@ import java.util.function.Consumer; @@ -27,10 +27,10 @@ import java.util.function.Consumer;
27 import static cn.hutool.core.util.RandomUtil.randomEle; 27 import static cn.hutool.core.util.RandomUtil.randomEle;
28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE; 28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE;
29 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS; 29 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS;
30 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
31 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
32 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 30 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  31 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
33 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 32 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  33 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
34 import static org.junit.jupiter.api.Assertions.*; 34 import static org.junit.jupiter.api.Assertions.*;
35 35
36 /** 36 /**
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java
  View file @a927dd0
@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper; @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper;
12 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; 12 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum;
13 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; 13 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum;
14 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; 14 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl;
15 -import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 15 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
16 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 16 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
17 import org.junit.jupiter.api.Test; 17 import org.junit.jupiter.api.Test;
18 import org.springframework.context.annotation.Import; 18 import org.springframework.context.annotation.Import;
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Import; @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Import;
20 import javax.annotation.Resource; 20 import javax.annotation.Resource;
21 import java.util.List; 21 import java.util.List;
22 22
23 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 23 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
24 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 24 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
25 import static org.junit.jupiter.api.Assertions.assertEquals; 25 import static org.junit.jupiter.api.Assertions.assertEquals;
26 26
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java
  View file @a927dd0
@@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper;
16 import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; 16 import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum;
17 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl; 17 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl;
18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
19 -import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 19 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
20 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 20 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
21 import org.junit.jupiter.api.Test; 21 import org.junit.jupiter.api.Test;
22 import org.springframework.boot.test.mock.mockito.MockBean; 22 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -27,8 +27,8 @@ import java.util.*; @@ -27,8 +27,8 @@ import java.util.*;
27 import java.util.concurrent.ExecutionException; 27 import java.util.concurrent.ExecutionException;
28 import java.util.concurrent.Future; 28 import java.util.concurrent.Future;
29 29
30 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
31 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; 30 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  31 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
32 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 32 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
33 import static org.junit.jupiter.api.Assertions.assertEquals; 33 import static org.junit.jupiter.api.Assertions.assertEquals;
34 import static org.mockito.Mockito.when; 34 import static org.mockito.Mockito.when;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java
  View file @a927dd0
@@ -20,10 +20,10 @@ import java.util.function.Consumer; @@ -20,10 +20,10 @@ import java.util.function.Consumer;
20 20
21 import static cn.hutool.core.util.RandomUtil.randomEle; 21 import static cn.hutool.core.util.RandomUtil.randomEle;
22 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.NOTICE_NOT_FOUND; 22 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.NOTICE_NOT_FOUND;
23 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
24 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
25 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;  
26 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; 23 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  24 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  25 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
  26 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
27 import static org.junit.jupiter.api.Assertions.*; 27 import static org.junit.jupiter.api.Assertions.*;
28 28
29 @Import(SysNoticeServiceImpl.class) 29 @Import(SysNoticeServiceImpl.class)
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java
  View file @a927dd0
@@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; @@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum;
13 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; 13 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer;
14 import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; 14 import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl;
15 import cn.iocoder.yudao.framework.common.util.sping.SpringAopUtils; 15 import cn.iocoder.yudao.framework.common.util.sping.SpringAopUtils;
16 -import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 16 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
17 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 17 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
18 import com.google.common.collect.Multimap; 18 import com.google.common.collect.Multimap;
19 import org.junit.jupiter.api.Assertions; 19 import org.junit.jupiter.api.Assertions;
@@ -25,9 +25,9 @@ import javax.annotation.Resource; @@ -25,9 +25,9 @@ import javax.annotation.Resource;
25 import java.util.*; 25 import java.util.*;
26 26
27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
28 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
29 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
30 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 28 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  29 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  30 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
31 import static org.junit.jupiter.api.Assertions.assertEquals; 31 import static org.junit.jupiter.api.Assertions.assertEquals;
32 import static org.mockito.Mockito.verify; 32 import static org.mockito.Mockito.verify;
33 33
@@ -108,7 +108,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest { @@ -108,7 +108,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
108 Long parentId = sonMenuDO.getParentId(); 108 Long parentId = sonMenuDO.getParentId();
109 109
110 //调用 110 //调用
111 - SysMenuUpdateReqVO vo = RandomUtils.randomPojo(SysMenuUpdateReqVO.class, o -> { 111 + SysMenuUpdateReqVO vo = randomPojo(SysMenuUpdateReqVO.class, o -> {
112 o.setId(sonId); 112 o.setId(sonId);
113 o.setParentId(parentId); 113 o.setParentId(parentId);
114 o.setType(MenuTypeEnum.MENU.getType()); 114 o.setType(MenuTypeEnum.MENU.getType());
@@ -131,7 +131,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest { @@ -131,7 +131,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
131 Long parentId = 10000L; 131 Long parentId = 10000L;
132 132
133 //调用 133 //调用
134 - SysMenuUpdateReqVO vo = RandomUtils.randomPojo(SysMenuUpdateReqVO.class, o -> { 134 + SysMenuUpdateReqVO vo = randomPojo(SysMenuUpdateReqVO.class, o -> {
135 o.setId(sonId); 135 o.setId(sonId);
136 o.setParentId(parentId); 136 o.setParentId(parentId);
137 o.setType(MenuTypeEnum.MENU.getType()); 137 o.setType(MenuTypeEnum.MENU.getType());
@@ -354,7 +354,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest { @@ -354,7 +354,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
354 } 354 }
355 355
356 private SysMenuDO createMenuDO(Long id, MenuTypeEnum typeEnum, String menuName, Long parentId, Integer status) { 356 private SysMenuDO createMenuDO(Long id, MenuTypeEnum typeEnum, String menuName, Long parentId, Integer status) {
357 - return RandomUtils.randomPojo(SysMenuDO.class, o -> { 357 + return randomPojo(SysMenuDO.class, o -> {
358 o.setId(id); 358 o.setId(id);
359 o.setParentId(parentId); 359 o.setParentId(parentId);
360 o.setType(typeEnum.getType()); 360 o.setType(typeEnum.getType());
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java
  View file @a927dd0
@@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import; @@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import;
14 import javax.annotation.Resource; 14 import javax.annotation.Resource;
15 import java.util.List; 15 import java.util.List;
16 16
17 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
18 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;  
19 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; 17 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  18 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
  19 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
20 import static org.junit.jupiter.api.Assertions.assertEquals; 20 import static org.junit.jupiter.api.Assertions.assertEquals;
21 import static org.mockito.Mockito.verify; 21 import static org.mockito.Mockito.verify;
22 22
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java
  View file @a927dd0
@@ -23,10 +23,10 @@ import java.util.*; @@ -23,10 +23,10 @@ import java.util.*;
23 import java.util.stream.Collectors; 23 import java.util.stream.Collectors;
24 24
25 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 25 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
26 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
27 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
28 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 26 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  27 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
29 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max; 28 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
  29 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
30 import static org.junit.jupiter.api.Assertions.*; 30 import static org.junit.jupiter.api.Assertions.*;
31 import static org.mockito.Mockito.verify; 31 import static org.mockito.Mockito.verify;
32 32
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java
  View file @a927dd0
@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
4 import cn.iocoder.dashboard.BaseDbUnitTest; 4 import cn.iocoder.dashboard.BaseDbUnitTest;
5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; 7 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
8 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO;
9 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO; 9 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO;
10 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO; 10 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO;
@@ -25,10 +25,10 @@ import java.util.function.Consumer; @@ -25,10 +25,10 @@ import java.util.function.Consumer;
25 import static cn.hutool.core.util.RandomUtil.randomEle; 25 import static cn.hutool.core.util.RandomUtil.randomEle;
26 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; 26 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN;
27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; 27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS;
28 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.*;  
29 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;  
30 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 28 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
31 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max; 29 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
  30 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
  31 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
32 import static org.junit.jupiter.api.Assertions.*; 32 import static org.junit.jupiter.api.Assertions.*;
33 import static org.mockito.ArgumentMatchers.eq; 33 import static org.mockito.ArgumentMatchers.eq;
34 import static org.mockito.Mockito.*; 34 import static org.mockito.Mockito.*;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java
  View file @a927dd0
@@ -27,9 +27,9 @@ import java.util.function.Consumer; @@ -27,9 +27,9 @@ import java.util.function.Consumer;
27 27
28 import static cn.hutool.core.util.RandomUtil.randomBoolean; 28 import static cn.hutool.core.util.RandomUtil.randomBoolean;
29 import static cn.hutool.core.util.RandomUtil.randomEle; 29 import static cn.hutool.core.util.RandomUtil.randomEle;
30 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
31 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 30 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
32 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 31 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  32 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
33 import static org.junit.jupiter.api.Assertions.*; 33 import static org.junit.jupiter.api.Assertions.*;
34 34
35 /** 35 /**
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java
  View file @a927dd0
@@ -5,11 +5,11 @@ import cn.iocoder.dashboard.BaseMockitoUnitTest; @@ -5,11 +5,11 @@ import cn.iocoder.dashboard.BaseMockitoUnitTest;
5 import cn.iocoder.yudao.framework.common.core.KeyValue; 5 import cn.iocoder.yudao.framework.common.core.KeyValue;
6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 7 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
8 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClient;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
11 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
12 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; 8 +import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
  9 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
  10 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  11 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  12 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
13 import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO; 13 import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO;
14 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage; 14 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage;
15 import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; 15 import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer;
@@ -25,8 +25,8 @@ import java.util.Map; @@ -25,8 +25,8 @@ import java.util.Map;
25 25
26 import static cn.hutool.core.util.RandomUtil.randomEle; 26 import static cn.hutool.core.util.RandomUtil.randomEle;
27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
28 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
29 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 28 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  29 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
30 import static org.junit.jupiter.api.Assertions.assertEquals; 30 import static org.junit.jupiter.api.Assertions.assertEquals;
31 import static org.mockito.ArgumentMatchers.eq; 31 import static org.mockito.ArgumentMatchers.eq;
32 import static org.mockito.Mockito.*; 32 import static org.mockito.Mockito.*;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java
  View file @a927dd0
@@ -4,10 +4,10 @@ import cn.iocoder.dashboard.BaseDbUnitTest; @@ -4,10 +4,10 @@ import cn.iocoder.dashboard.BaseDbUnitTest;
4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 5 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClient;  
8 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; 7 +import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
  8 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
  9 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  10 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
11 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO; 11 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO;
12 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO; 12 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO;
13 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplatePageReqVO; 13 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplatePageReqVO;
@@ -34,11 +34,11 @@ import java.util.function.Consumer; @@ -34,11 +34,11 @@ import java.util.function.Consumer;
34 import static cn.hutool.core.bean.BeanUtil.getFieldValue; 34 import static cn.hutool.core.bean.BeanUtil.getFieldValue;
35 import static cn.hutool.core.util.RandomUtil.randomEle; 35 import static cn.hutool.core.util.RandomUtil.randomEle;
36 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 36 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
37 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
38 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
39 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 37 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  38 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
40 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 39 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
41 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max; 40 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
  41 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
42 import static org.junit.jupiter.api.Assertions.*; 42 import static org.junit.jupiter.api.Assertions.*;
43 import static org.mockito.ArgumentMatchers.eq; 43 import static org.mockito.ArgumentMatchers.eq;
44 import static org.mockito.Mockito.*; 44 import static org.mockito.Mockito.*;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java
  View file @a927dd0
@@ -35,10 +35,10 @@ import java.util.function.Consumer; @@ -35,10 +35,10 @@ import java.util.function.Consumer;
35 import static cn.hutool.core.util.RandomUtil.randomBytes; 35 import static cn.hutool.core.util.RandomUtil.randomBytes;
36 import static cn.hutool.core.util.RandomUtil.randomEle; 36 import static cn.hutool.core.util.RandomUtil.randomEle;
37 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 37 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
38 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;  
39 -import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;  
40 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 38 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  39 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
41 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 40 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  41 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
42 import static org.assertj.core.util.Lists.newArrayList; 42 import static org.assertj.core.util.Lists.newArrayList;
43 import static org.junit.jupiter.api.Assertions.assertEquals; 43 import static org.junit.jupiter.api.Assertions.assertEquals;
44 import static org.junit.jupiter.api.Assertions.assertNull; 44 import static org.junit.jupiter.api.Assertions.assertNull;
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/DictConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java
  View file @a927dd0
1 package cn.iocoder.yudao.framework.dict.config; 1 package cn.iocoder.yudao.framework.dict.config;
2 2
3 import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService; 3 import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService;
4 -import cn.iocoder.yudao.framework.dict.core.util.DictUtils; 4 +import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
5 import org.springframework.context.annotation.Bean; 5 import org.springframework.context.annotation.Bean;
6 import org.springframework.context.annotation.Configuration; 6 import org.springframework.context.annotation.Configuration;
7 7
8 @Configuration 8 @Configuration
9 -public class DictConfiguration { 9 +public class YudaoDictAutoConfiguration {
10 10
11 @Bean 11 @Bean
12 @SuppressWarnings("InstantiationOfUtilityClass") 12 @SuppressWarnings("InstantiationOfUtilityClass")
13 - public DictUtils dictUtils(DictDataFrameworkService service) {  
14 - DictUtils.init(service);  
15 - return new DictUtils(); 13 + public DictFrameworkUtils dictUtils(DictDataFrameworkService service) {
  14 + DictFrameworkUtils.init(service);
  15 + return new DictFrameworkUtils();
16 } 16 }
17 17
18 } 18 }
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictUtils.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java
  View file @a927dd0
@@ -8,13 +8,13 @@ import lombok.extern.slf4j.Slf4j; @@ -8,13 +8,13 @@ import lombok.extern.slf4j.Slf4j;
8 * 字典工具类 8 * 字典工具类
9 */ 9 */
10 @Slf4j 10 @Slf4j
11 -public class DictUtils { 11 +public class DictFrameworkUtils {
12 12
13 private static DictDataFrameworkService service; 13 private static DictDataFrameworkService service;
14 14
15 public static void init(DictDataFrameworkService service) { 15 public static void init(DictDataFrameworkService service) {
16 - DictUtils.service = service;  
17 - log.info("[init][初始化 DictUtils 成功]"); 16 + DictFrameworkUtils.service = service;
  17 + log.info("[init][初始化 DictFrameworkUtils 成功]");
18 } 18 }
19 19
20 public static DictDataRespDTO getDictDataFromCache(String type, String value) { 20 public static DictDataRespDTO getDictDataFromCache(String type, String value) {
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java
  View file @a927dd0
1 /** 1 /**
2 - * 字典数据模块，提供 {@link cn.iocoder.yudao.framework.dict.core.util.DictUtils} 工具类 2 + * 字典数据模块，提供 {@link cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils} 工具类
3 * 3 *
4 * 通过将字典缓存在内存中，保证性能 4 * 通过将字典缓存在内存中，保证性能
5 */ 5 */
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/dto/OperateLogCreateReqDTO.java
  View file @a927dd0
@@ -56,7 +56,7 @@ public class OperateLogCreateReqDTO { @@ -56,7 +56,7 @@ public class OperateLogCreateReqDTO {
56 @NotEmpty(message = "浏览器 UserAgent 不能为空") 56 @NotEmpty(message = "浏览器 UserAgent 不能为空")
57 private String userAgent; 57 private String userAgent;
58 58
59 - @ApiModelProperty(value = "Java 方法名", required = true, example = "cn.iocoder.dashboard.UserController.save(...)") 59 + @ApiModelProperty(value = "Java 方法名", required = true, example = "cn.iocoder.yudao.UserController.save(...)")
60 @NotEmpty(message = "Java 方法名不能为空") 60 @NotEmpty(message = "Java 方法名不能为空")
61 private String javaMethod; 61 private String javaMethod;
62 62
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/config/YudaoSmsAutoConfiguration.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.config; 1 +package cn.iocoder.yudao.framework.sms.config;
2 2
3 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory;  
4 -import cn.iocoder.dashboard.framework.sms.core.client.impl.SmsClientFactoryImpl; 3 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
  4 +import cn.iocoder.yudao.framework.sms.core.client.impl.SmsClientFactoryImpl;
5 import org.springframework.context.annotation.Bean; 5 import org.springframework.context.annotation.Bean;
6 import org.springframework.context.annotation.Configuration; 6 import org.springframework.context.annotation.Configuration;
7 7
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
11 * @author 芋道源码 11 * @author 芋道源码
12 */ 12 */
13 @Configuration 13 @Configuration
14 -public class SmsConfiguration { 14 +public class YudaoSmsAutoConfiguration {
15 15
16 @Bean 16 @Bean
17 public SmsClientFactory smsClientFactory() { 17 public SmsClientFactory smsClientFactory() {
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClient.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client; 1 +package cn.iocoder.yudao.framework.sms.core.client;
2 2
3 import cn.iocoder.yudao.framework.common.core.KeyValue; 3 import cn.iocoder.yudao.framework.common.core.KeyValue;
4 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
5 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;  
6 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; 4 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  5 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
  6 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
7 7
8 import java.util.List; 8 import java.util.List;
9 9
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClientFactory.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client; 1 +package cn.iocoder.yudao.framework.sms.core.client;
2 2
3 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 3 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
4 4
5 /** 5 /**
6 * 短信客户端工厂接口 6 * 短信客户端工厂接口
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCodeMapping.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client; 1 +package cn.iocoder.yudao.framework.sms.core.client;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; 4 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
5 5
6 import java.util.function.Function; 6 import java.util.function.Function;
7 7
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCommonResult.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client; 1 +package cn.iocoder.yudao.framework.sms.core.client;
2 2
3 import cn.hutool.core.exceptions.ExceptionUtil; 3 import cn.hutool.core.exceptions.ExceptionUtil;
4 import cn.hutool.core.lang.Assert; 4 import cn.hutool.core.lang.Assert;
5 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 5 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
6 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 6 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
7 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; 7 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
8 import lombok.Data; 8 import lombok.Data;
9 import lombok.EqualsAndHashCode; 9 import lombok.EqualsAndHashCode;
10 import lombok.ToString; 10 import lombok.ToString;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsReceiveRespDTO.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.dto; 1 +package cn.iocoder.yudao.framework.sms.core.client.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsSendRespDTO.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.dto; 1 +package cn.iocoder.yudao.framework.sms.core.client.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsTemplateRespDTO.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.dto; 1 +package cn.iocoder.yudao.framework.sms.core.client.dto;
2 2
3 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; 3 +import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/AbstractSmsClient.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl;
2 2
3 import cn.iocoder.yudao.framework.common.core.KeyValue; 3 import cn.iocoder.yudao.framework.common.core.KeyValue;
4 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClient;  
5 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;  
6 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
7 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
8 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;  
10 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 4 +import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
  5 +import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping;
  6 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  7 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  8 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
  9 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
  10 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
11 import lombok.extern.slf4j.Slf4j; 11 import lombok.extern.slf4j.Slf4j;
12 12
13 import java.util.List; 13 import java.util.List;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/SmsClientFactoryImpl.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl;
2 2
3 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClient;  
4 -import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory;  
5 -import cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun.AliyunSmsClient;  
6 -import cn.iocoder.dashboard.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient;  
7 -import cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian.YunpianSmsClient;  
8 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum;  
9 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 3 +import cn.iocoder.yudao.framework.sms.core.client.SmsClient;
  4 +import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
  5 +import cn.iocoder.yudao.framework.sms.core.client.impl.aliyun.AliyunSmsClient;
  6 +import cn.iocoder.yudao.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient;
  7 +import cn.iocoder.yudao.framework.sms.core.client.impl.yunpian.YunpianSmsClient;
  8 +import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum;
  9 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
10 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
11 import org.springframework.util.Assert; 11 import org.springframework.util.Assert;
12 import org.springframework.validation.annotation.Validated; 12 import org.springframework.validation.annotation.Validated;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun;
2 2
3 import cn.hutool.core.lang.Assert; 3 import cn.hutool.core.lang.Assert;
4 import cn.hutool.core.util.ReflectUtil; 4 import cn.hutool.core.util.ReflectUtil;
5 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
6 import cn.iocoder.yudao.framework.common.core.KeyValue; 6 import cn.iocoder.yudao.framework.common.core.KeyValue;
7 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
8 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;  
11 -import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;  
12 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;  
13 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 7 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  8 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  9 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
  10 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
  11 +import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient;
  12 +import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
  13 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
14 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 14 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
15 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 15 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
16 import com.aliyuncs.AcsRequest; 16 import com.aliyuncs.AcsRequest;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
5 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;  
6 -  
7 -import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*; 5 +import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping;
  6 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
8 7
9 /** 8 /**
10 * 阿里云的 SmsCodeMapping 实现类 9 * 阿里云的 SmsCodeMapping 实现类
@@ -21,23 +20,23 @@ public class AliyunSmsCodeMapping implements SmsCodeMapping { @@ -21,23 +20,23 @@ public class AliyunSmsCodeMapping implements SmsCodeMapping {
21 case "OK": return GlobalErrorCodeConstants.SUCCESS; 20 case "OK": return GlobalErrorCodeConstants.SUCCESS;
22 case "isv.ACCOUNT_NOT_EXISTS": 21 case "isv.ACCOUNT_NOT_EXISTS":
23 case "isv.ACCOUNT_ABNORMAL": 22 case "isv.ACCOUNT_ABNORMAL":
24 - case "MissingAccessKeyId": return SMS_ACCOUNT_INVALID;  
25 - case "isp.RAM_PERMISSION_DENY": return SMS_PERMISSION_DENY; 23 + case "MissingAccessKeyId": return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_INVALID;
  24 + case "isp.RAM_PERMISSION_DENY": return SmsFrameworkErrorCodeConstants.SMS_PERMISSION_DENY;
26 case "isv.INVALID_JSON_PARAM": 25 case "isv.INVALID_JSON_PARAM":
27 - case "isv.INVALID_PARAMETERS": return SMS_API_PARAM_ERROR;  
28 - case "isv.BUSINESS_LIMIT_CONTROL": return SMS_SEND_BUSINESS_LIMIT_CONTROL;  
29 - case "isv.DAY_LIMIT_CONTROL": return SMS_SEND_DAY_LIMIT_CONTROL;  
30 - case "isv.SMS_CONTENT_ILLEGAL": return SMS_SEND_CONTENT_INVALID;  
31 - case "isv.SMS_TEMPLATE_ILLEGAL": return SMS_TEMPLATE_INVALID; 26 + case "isv.INVALID_PARAMETERS": return SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR;
  27 + case "isv.BUSINESS_LIMIT_CONTROL": return SmsFrameworkErrorCodeConstants.SMS_SEND_BUSINESS_LIMIT_CONTROL;
  28 + case "isv.DAY_LIMIT_CONTROL": return SmsFrameworkErrorCodeConstants.SMS_SEND_DAY_LIMIT_CONTROL;
  29 + case "isv.SMS_CONTENT_ILLEGAL": return SmsFrameworkErrorCodeConstants.SMS_SEND_CONTENT_INVALID;
  30 + case "isv.SMS_TEMPLATE_ILLEGAL": return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_INVALID;
32 case "isv.SMS_SIGNATURE_ILLEGAL": 31 case "isv.SMS_SIGNATURE_ILLEGAL":
33 case "isv.SIGN_NAME_ILLEGAL": 32 case "isv.SIGN_NAME_ILLEGAL":
34 - case "isv.SMS_SIGN_ILLEGAL": return SMS_SIGN_INVALID; 33 + case "isv.SMS_SIGN_ILLEGAL": return SmsFrameworkErrorCodeConstants.SMS_SIGN_INVALID;
35 case "isv.AMOUNT_NOT_ENOUGH": 34 case "isv.AMOUNT_NOT_ENOUGH":
36 - case "isv.OUT_OF_SERVICE": return SMS_ACCOUNT_MONEY_NOT_ENOUGH;  
37 - case "isv.MOBILE_NUMBER_ILLEGAL": return SMS_MOBILE_INVALID;  
38 - case "isv.TEMPLATE_MISSING_PARAMETERS": return SMS_TEMPLATE_PARAM_ERROR; 35 + case "isv.OUT_OF_SERVICE": return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_MONEY_NOT_ENOUGH;
  36 + case "isv.MOBILE_NUMBER_ILLEGAL": return SmsFrameworkErrorCodeConstants.SMS_MOBILE_INVALID;
  37 + case "isv.TEMPLATE_MISSING_PARAMETERS": return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_PARAM_ERROR;
39 } 38 }
40 - return SMS_UNKNOWN; 39 + return SmsFrameworkErrorCodeConstants.SMS_UNKNOWN;
41 } 40 }
42 41
43 } 42 }
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.debug; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.debug;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
5 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; 5 +import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping;
  6 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
6 7
7 import java.util.Objects; 8 import java.util.Objects;
8 9
9 -import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_UNKNOWN;  
10 -  
11 /** 10 /**
12 * 钉钉的 SmsCodeMapping 实现类 11 * 钉钉的 SmsCodeMapping 实现类
13 * 12 *
@@ -17,7 +16,7 @@ public class DebugDingTalkCodeMapping implements SmsCodeMapping { @@ -17,7 +16,7 @@ public class DebugDingTalkCodeMapping implements SmsCodeMapping {
17 16
18 @Override 17 @Override
19 public ErrorCode apply(String apiCode) { 18 public ErrorCode apply(String apiCode) {
20 - return Objects.equals(apiCode, "0") ? GlobalErrorCodeConstants.SUCCESS : SMS_UNKNOWN; 19 + return Objects.equals(apiCode, "0") ? GlobalErrorCodeConstants.SUCCESS : SmsFrameworkErrorCodeConstants.SMS_UNKNOWN;
21 } 20 }
22 21
23 } 22 }
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.debug; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.debug;
2 2
3 import cn.hutool.core.codec.Base64; 3 import cn.hutool.core.codec.Base64;
4 import cn.hutool.core.lang.Assert; 4 import cn.hutool.core.lang.Assert;
@@ -8,13 +8,13 @@ import cn.hutool.crypto.digest.DigestUtil; @@ -8,13 +8,13 @@ import cn.hutool.crypto.digest.DigestUtil;
8 import cn.hutool.crypto.digest.HmacAlgorithm; 8 import cn.hutool.crypto.digest.HmacAlgorithm;
9 import cn.hutool.http.HttpUtil; 9 import cn.hutool.http.HttpUtil;
10 import cn.iocoder.yudao.framework.common.core.KeyValue; 10 import cn.iocoder.yudao.framework.common.core.KeyValue;
11 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
12 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
13 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;  
14 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;  
15 -import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;  
16 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;  
17 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 11 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  12 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  13 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
  14 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
  15 +import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient;
  16 +import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
  17 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
18 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 18 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
19 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 19 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
20 20
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.yunpian;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.lang.Assert; 4 import cn.hutool.core.lang.Assert;
5 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
6 import cn.hutool.core.util.URLUtil; 6 import cn.hutool.core.util.URLUtil;
7 import cn.iocoder.yudao.framework.common.core.KeyValue; 7 import cn.iocoder.yudao.framework.common.core.KeyValue;
8 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;  
11 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;  
12 -import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;  
13 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;  
14 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 8 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  9 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  10 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
  11 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
  12 +import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient;
  13 +import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
  14 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
15 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 15 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
16 import com.fasterxml.jackson.annotation.JsonFormat; 16 import com.fasterxml.jackson.annotation.JsonFormat;
17 import com.fasterxml.jackson.annotation.JsonProperty; 17 import com.fasterxml.jackson.annotation.JsonProperty;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.yunpian;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; 4 +import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping;
  5 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
5 6
6 import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; 7 import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
7 -import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*;  
8 import static com.yunpian.sdk.constant.Code.*; 8 import static com.yunpian.sdk.constant.Code.*;
9 9
10 /** 10 /**
@@ -21,25 +21,25 @@ public class YunpianSmsCodeMapping implements SmsCodeMapping { @@ -21,25 +21,25 @@ public class YunpianSmsCodeMapping implements SmsCodeMapping {
21 int code = Integer.parseInt(apiCode); 21 int code = Integer.parseInt(apiCode);
22 switch (code) { 22 switch (code) {
23 case OK: return SUCCESS; 23 case OK: return SUCCESS;
24 - case ARGUMENT_MISSING: return SMS_API_PARAM_ERROR;  
25 - case BAD_ARGUMENT_FORMAT: return SMS_TEMPLATE_PARAM_ERROR; 24 + case ARGUMENT_MISSING: return SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR;
  25 + case BAD_ARGUMENT_FORMAT: return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_PARAM_ERROR;
26 case TPL_NOT_FOUND: 26 case TPL_NOT_FOUND:
27 - case TPL_NOT_VALID: return SMS_TEMPLATE_INVALID;  
28 - case MONEY_NOT_ENOUGH: return SMS_ACCOUNT_MONEY_NOT_ENOUGH;  
29 - case BLACK_WORD: return SMS_SEND_CONTENT_INVALID; 27 + case TPL_NOT_VALID: return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_INVALID;
  28 + case MONEY_NOT_ENOUGH: return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_MONEY_NOT_ENOUGH;
  29 + case BLACK_WORD: return SmsFrameworkErrorCodeConstants.SMS_SEND_CONTENT_INVALID;
30 case DUP_IN_SHORT_TIME: 30 case DUP_IN_SHORT_TIME:
31 case TOO_MANY_TIME_IN_5: 31 case TOO_MANY_TIME_IN_5:
32 case DAY_LIMIT_PER_MOBILE: 32 case DAY_LIMIT_PER_MOBILE:
33 - case HOUR_LIMIT_PER_MOBILE: return SMS_SEND_BUSINESS_LIMIT_CONTROL;  
34 - case BLACK_PHONE_FILTER: return SMS_MOBILE_BLACK; 33 + case HOUR_LIMIT_PER_MOBILE: return SmsFrameworkErrorCodeConstants.SMS_SEND_BUSINESS_LIMIT_CONTROL;
  34 + case BLACK_PHONE_FILTER: return SmsFrameworkErrorCodeConstants.SMS_MOBILE_BLACK;
35 case SIGN_NOT_MATCH: 35 case SIGN_NOT_MATCH:
36 case BAD_SIGN_FORMAT: 36 case BAD_SIGN_FORMAT:
37 - case SIGN_NOT_VALID: return SMS_SIGN_INVALID;  
38 - case BAD_API_KEY: return SMS_ACCOUNT_INVALID;  
39 - case API_NOT_ALLOWED: return SMS_PERMISSION_DENY;  
40 - case IP_NOT_ALLOWED: return SMS_IP_DENY; 37 + case SIGN_NOT_VALID: return SmsFrameworkErrorCodeConstants.SMS_SIGN_INVALID;
  38 + case BAD_API_KEY: return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_INVALID;
  39 + case API_NOT_ALLOWED: return SmsFrameworkErrorCodeConstants.SMS_PERMISSION_DENY;
  40 + case IP_NOT_ALLOWED: return SmsFrameworkErrorCodeConstants.SMS_IP_DENY;
41 } 41 }
42 - return SMS_UNKNOWN; 42 + return SmsFrameworkErrorCodeConstants.SMS_UNKNOWN;
43 } 43 }
44 44
45 } 45 }
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsChannelEnum.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.enums; 1 +package cn.iocoder.yudao.framework.sms.core.enums;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.enums; 1 +package cn.iocoder.yudao.framework.sms.core.enums;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.enums; 1 +package cn.iocoder.yudao.framework.sms.core.enums;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/property/SmsChannelProperties.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.property; 1 +package cn.iocoder.yudao.framework.sms.core.property;
2 2
3 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; 3 +import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum;
4 import lombok.Data; 4 import lombok.Data;
5 import org.springframework.validation.annotation.Validated; 5 import org.springframework.validation.annotation.Validated;
6 6
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun;
2 2
3 import cn.hutool.core.util.ReflectUtil; 3 import cn.hutool.core.util.ReflectUtil;
4 -import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest; 4 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
5 import cn.iocoder.yudao.framework.common.core.KeyValue; 5 import cn.iocoder.yudao.framework.common.core.KeyValue;
6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
7 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
8 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;  
11 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;  
12 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 7 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  8 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  9 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
  10 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
  11 +import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
  12 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
13 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 13 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
14 import cn.iocoder.yudao.framework.common.util.date.DateUtils; 14 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
  15 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
15 import com.aliyuncs.AcsRequest; 16 import com.aliyuncs.AcsRequest;
16 import com.aliyuncs.IAcsClient; 17 import com.aliyuncs.IAcsClient;
17 import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; 18 import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest;
@@ -20,6 +21,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; @@ -20,6 +21,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
20 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; 21 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
21 import com.aliyuncs.exceptions.ClientException; 22 import com.aliyuncs.exceptions.ClientException;
22 import com.google.common.collect.Lists; 23 import com.google.common.collect.Lists;
  24 +import org.junit.jupiter.api.Assertions;
23 import org.junit.jupiter.api.Test; 25 import org.junit.jupiter.api.Test;
24 import org.mockito.ArgumentMatcher; 26 import org.mockito.ArgumentMatcher;
25 import org.mockito.InjectMocks; 27 import org.mockito.InjectMocks;
@@ -28,9 +30,8 @@ import org.mockito.Mock; @@ -28,9 +30,8 @@ import org.mockito.Mock;
28 import java.util.List; 30 import java.util.List;
29 import java.util.function.Function; 31 import java.util.function.Function;
30 32
31 -import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR;  
32 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;  
33 import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; 33 import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
  34 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
34 import static org.junit.jupiter.api.Assertions.*; 35 import static org.junit.jupiter.api.Assertions.*;
35 import static org.mockito.ArgumentMatchers.any; 36 import static org.mockito.ArgumentMatchers.any;
36 import static org.mockito.ArgumentMatchers.argThat; 37 import static org.mockito.ArgumentMatchers.argThat;
@@ -184,8 +185,8 @@ public class AliyunSmsClientTest extends BaseMockitoUnitTest { @@ -184,8 +185,8 @@ public class AliyunSmsClientTest extends BaseMockitoUnitTest {
184 // 断言 185 // 断言
185 assertEquals(ex.getErrCode(), result.getApiCode()); 186 assertEquals(ex.getErrCode(), result.getApiCode());
186 assertEquals(ex.getErrMsg(), result.getApiMsg()); 187 assertEquals(ex.getErrMsg(), result.getApiMsg());
187 - assertEquals(SMS_API_PARAM_ERROR.getCode(), result.getCode());  
188 - assertEquals(SMS_API_PARAM_ERROR.getMsg(), result.getMsg()); 188 + Assertions.assertEquals(SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR.getCode(), result.getCode());
  189 + Assertions.assertEquals(SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR.getMsg(), result.getMsg());
189 assertEquals(ex.getRequestId(), result.getApiRequestId()); 190 assertEquals(ex.getRequestId(), result.getApiRequestId());
190 } 191 }
191 192
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun;
2 2
3 -import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest; 3 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
5 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; 5 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
6 import org.junit.jupiter.api.Test; 6 import org.junit.jupiter.api.Test;
7 import org.mockito.InjectMocks; 7 import org.mockito.InjectMocks;
8 8
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.yunpian;
2 2
3 import cn.hutool.core.util.ReflectUtil; 3 import cn.hutool.core.util.ReflectUtil;
4 -import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest; 4 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
5 import cn.iocoder.yudao.framework.common.core.KeyValue; 5 import cn.iocoder.yudao.framework.common.core.KeyValue;
6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
7 -import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;  
8 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;  
9 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;  
10 -import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;  
11 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;  
12 -import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 7 +import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult;
  8 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
  9 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
  10 +import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
  11 +import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
  12 +import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
13 import cn.iocoder.yudao.framework.common.util.date.DateUtils; 13 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
14 import com.google.common.collect.Lists; 14 import com.google.common.collect.Lists;
15 import com.yunpian.sdk.YunpianClient; 15 import com.yunpian.sdk.YunpianClient;
@@ -29,7 +29,7 @@ import java.util.Map; @@ -29,7 +29,7 @@ import java.util.Map;
29 import java.util.function.Function; 29 import java.util.function.Function;
30 import java.util.function.Supplier; 30 import java.util.function.Supplier;
31 31
32 -import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 32 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
33 import static com.yunpian.sdk.constant.Code.OK; 33 import static com.yunpian.sdk.constant.Code.OK;
34 import static org.junit.jupiter.api.Assertions.*; 34 import static org.junit.jupiter.api.Assertions.*;
35 import static org.mockito.Mockito.*; 35 import static org.mockito.Mockito.*;
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; 1 +package cn.iocoder.yudao.framework.sms.core.client.impl.yunpian;
2 2
3 -import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest; 3 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
5 -import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; 5 +import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
  6 +import org.junit.jupiter.api.Assertions;
6 import org.junit.jupiter.api.Test; 7 import org.junit.jupiter.api.Test;
7 import org.mockito.InjectMocks; 8 import org.mockito.InjectMocks;
8 9
@@ -22,7 +23,7 @@ class YunpianSmsCodeMappingTest extends BaseMockitoUnitTest { @@ -22,7 +23,7 @@ class YunpianSmsCodeMappingTest extends BaseMockitoUnitTest {
22 @Test 23 @Test
23 public void testApply() { 24 public void testApply() {
24 assertEquals(GlobalErrorCodeConstants.SUCCESS, codeMapping.apply(String.valueOf(OK))); 25 assertEquals(GlobalErrorCodeConstants.SUCCESS, codeMapping.apply(String.valueOf(OK)));
25 - assertEquals(SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR, codeMapping.apply(String.valueOf(ARGUMENT_MISSING))); 26 + Assertions.assertEquals(SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR, codeMapping.apply(String.valueOf(ARGUMENT_MISSING)));
26 assertEquals(SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_PARAM_ERROR, codeMapping.apply(String.valueOf(BAD_ARGUMENT_FORMAT))); 27 assertEquals(SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_PARAM_ERROR, codeMapping.apply(String.valueOf(BAD_ARGUMENT_FORMAT)));
27 assertEquals(SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_MONEY_NOT_ENOUGH, codeMapping.apply(String.valueOf(MONEY_NOT_ENOUGH))); 28 assertEquals(SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_MONEY_NOT_ENOUGH, codeMapping.apply(String.valueOf(MONEY_NOT_ENOUGH)));
28 assertEquals(SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_INVALID, codeMapping.apply(String.valueOf(TPL_NOT_FOUND))); 29 assertEquals(SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_INVALID, codeMapping.apply(String.valueOf(TPL_NOT_FOUND)));
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/ConfigConsts.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.apollo.core; 1 +package cn.iocoder.yudao.framework.apollo.core;
  2 +
  3 +import cn.iocoder.yudao.framework.apollo.internals.ConfigFrameworkDAO;
2 4
3 /** 5 /**
4 * 针对 {@link com.ctrip.framework.apollo.core.ConfigConsts} 的补充，主要增加： 6 * 针对 {@link com.ctrip.framework.apollo.core.ConfigConsts} 的补充，主要增加：
@@ -10,7 +12,7 @@ package cn.iocoder.dashboard.framework.apollo.core; @@ -10,7 +12,7 @@ package cn.iocoder.dashboard.framework.apollo.core;
10 public class ConfigConsts { 12 public class ConfigConsts {
11 13
12 /** 14 /**
13 - * {@link cn.iocoder.dashboard.framework.apollo.internals.ConfigFrameworkDAO} 的实现类 15 + * {@link ConfigFrameworkDAO} 的实现类
14 */ 16 */
15 public static final String APOLLO_JDBC_DAO = "apollo.jdbc.dao"; 17 public static final String APOLLO_JDBC_DAO = "apollo.jdbc.dao";
16 public static final String APOLLO_JDBC_URL = "apollo.jdbc.url"; 18 public static final String APOLLO_JDBC_URL = "apollo.jdbc.url";
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/ConfigFrameworkDAO.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.apollo.internals; 1 +package cn.iocoder.yudao.framework.apollo.internals;
2 2
3 -import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; 3 +import cn.iocoder.yudao.framework.apollo.internals.dto.ConfigRespDTO;
4 4
5 import java.util.Date; 5 import java.util.Date;
6 import java.util.List; 6 import java.util.List;
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DBConfigRepository.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.apollo.internals; 1 +package cn.iocoder.yudao.framework.apollo.internals;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.util.ClassUtil; 4 import cn.hutool.core.util.ClassUtil;
5 import cn.hutool.core.util.ReflectUtil; 5 import cn.hutool.core.util.ReflectUtil;
6 -import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts;  
7 -import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; 6 +import cn.iocoder.yudao.framework.apollo.core.ConfigConsts;
  7 +import cn.iocoder.yudao.framework.apollo.internals.dto.ConfigRespDTO;
8 import com.ctrip.framework.apollo.Apollo; 8 import com.ctrip.framework.apollo.Apollo;
9 import com.ctrip.framework.apollo.build.ApolloInjector; 9 import com.ctrip.framework.apollo.build.ApolloInjector;
10 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory; 10 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DefaultXInjector.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.apollo.internals; 1 +package cn.iocoder.yudao.framework.apollo.internals;
2 2
3 -import cn.iocoder.dashboard.framework.apollo.spi.DBConfigFactory; 3 +import cn.iocoder.yudao.framework.apollo.spi.DBConfigFactory;
4 import com.ctrip.framework.apollo.exceptions.ApolloConfigException; 4 import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
5 import com.ctrip.framework.apollo.internals.*; 5 import com.ctrip.framework.apollo.internals.*;
6 import com.ctrip.framework.apollo.spi.*; 6 import com.ctrip.framework.apollo.spi.*;
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/dto/ConfigRespDTO.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.apollo.internals.dto; 1 +package cn.iocoder.yudao.framework.apollo.internals.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/package-info.java
  View file @a927dd0
1 /** 1 /**
2 * 配置中心客户端，基于 Apollo Client 进行简化 2 * 配置中心客户端，基于 Apollo Client 进行简化
3 * 3 *
4 - * 差别在于，我们使用 {@link cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO} 表作为配置源。 4 + * 差别在于，我们使用 cn.iocoder.yudao.modules.infra.dal.dataobject.config.InfConfigDO 表作为配置源。
5 * 当然，功能肯定也会相对少些，满足最小化诉求。 5 * 当然，功能肯定也会相对少些，满足最小化诉求。
6 * 6 *
7 * 1. 项目初始化时，可以使用 SysConfigDO 表的配置 7 * 1. 项目初始化时，可以使用 SysConfigDO 表的配置
@@ -10,4 +10,4 @@ @@ -10,4 +10,4 @@
10 * 10 *
11 * 另外，整个包结构会参考 Apollo 为主，方便维护与理解 11 * 另外，整个包结构会参考 Apollo 为主，方便维护与理解
12 */ 12 */
13 -package cn.iocoder.dashboard.framework.apollo; 13 +package cn.iocoder.yudao.framework.apollo;
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/spi/DBConfigFactory.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.apollo.spi; 1 +package cn.iocoder.yudao.framework.apollo.spi;
2 2
3 -import cn.iocoder.dashboard.framework.apollo.internals.DBConfigRepository; 3 +import cn.iocoder.yudao.framework.apollo.internals.DBConfigRepository;
4 import com.ctrip.framework.apollo.Config; 4 import com.ctrip.framework.apollo.Config;
5 import com.ctrip.framework.apollo.ConfigFile; 5 import com.ctrip.framework.apollo.ConfigFile;
6 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; 6 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.apollo.spring.boot; 1 +package cn.iocoder.yudao.framework.apollo.spring.boot;
2 2
3 -import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts; 3 +import cn.iocoder.yudao.framework.apollo.core.ConfigConsts;
4 import com.google.common.base.Strings; 4 import com.google.common.base.Strings;
5 import org.springframework.boot.SpringApplication; 5 import org.springframework.boot.SpringApplication;
6 import org.springframework.boot.env.EnvironmentPostProcessor; 6 import org.springframework.boot.env.EnvironmentPostProcessor;
yudao-framework/yudao-spring-boot-starter-config/src/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector 0 → 100644
  View file @a927dd0
  1 +cn.iocoder.yudao.framework.apollo.internals.DefaultXInjector
yudao-framework/yudao-spring-boot-starter-config/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.env.EnvironmentPostProcessor=\
  2 + cn.iocoder.yudao.framework.apollo.spring.boot.ApolloApplicationContextInitializer
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java
  View file @a927dd0
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.excel.core.convert; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.excel.core.convert;
2 2
3 import cn.hutool.core.convert.Convert; 3 import cn.hutool.core.convert.Convert;
4 import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; 4 import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
5 -import cn.iocoder.yudao.framework.dict.core.util.DictUtils; 5 +import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
6 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 6 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
7 import com.alibaba.excel.converters.Converter; 7 import com.alibaba.excel.converters.Converter;
8 import com.alibaba.excel.enums.CellDataTypeEnum; 8 import com.alibaba.excel.enums.CellDataTypeEnum;
@@ -35,7 +35,7 @@ public class DictConvert implements Converter<Object> { @@ -35,7 +35,7 @@ public class DictConvert implements Converter<Object> {
35 // 使用字典解析 35 // 使用字典解析
36 String type = getType(contentProperty); 36 String type = getType(contentProperty);
37 String label = cellData.getStringValue(); 37 String label = cellData.getStringValue();
38 - DictDataRespDTO dictData = DictUtils.parseDictDataFromCache(type, label); 38 + DictDataRespDTO dictData = DictFrameworkUtils.parseDictDataFromCache(type, label);
39 if (dictData == null) { 39 if (dictData == null) {
40 log.error("[convertToJavaData][type({}) 解析不掉 label({})]", type, label); 40 log.error("[convertToJavaData][type({}) 解析不掉 label({})]", type, label);
41 return null; 41 return null;
@@ -56,7 +56,7 @@ public class DictConvert implements Converter<Object> { @@ -56,7 +56,7 @@ public class DictConvert implements Converter<Object> {
56 // 使用字典格式化 56 // 使用字典格式化
57 String type = getType(contentProperty); 57 String type = getType(contentProperty);
58 String value = String.valueOf(object); 58 String value = String.valueOf(object);
59 - DictDataRespDTO dictData = DictUtils.getDictDataFromCache(type, value); 59 + DictDataRespDTO dictData = DictFrameworkUtils.getDictDataFromCache(type, value);
60 if (dictData == null) { 60 if (dictData == null) {
61 log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value); 61 log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value);
62 return new CellData<>(""); 62 return new CellData<>("");
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoQuartzAutoConfiguration.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.quartz.config; 1 +package cn.iocoder.yudao.framework.quartz.config;
2 2
3 -import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager; 3 +import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
4 import org.quartz.Scheduler; 4 import org.quartz.Scheduler;
5 import org.springframework.context.annotation.Bean; 5 import org.springframework.context.annotation.Bean;
6 import org.springframework.context.annotation.Configuration; 6 import org.springframework.context.annotation.Configuration;
@@ -8,7 +8,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @@ -8,7 +8,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
8 8
9 @Configuration 9 @Configuration
10 @EnableScheduling // 开启 Spring 自带的定时任务 10 @EnableScheduling // 开启 Spring 自带的定时任务
11 -public class QuartzConfig { 11 +public class YudaoQuartzAutoConfiguration {
12 12
13 @Bean 13 @Bean
14 public SchedulerManager schedulerManager(Scheduler scheduler) { 14 public SchedulerManager schedulerManager(Scheduler scheduler) {
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/enums/JobDataKeyEnum.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.quartz.core.enums; 1 +package cn.iocoder.yudao.framework.quartz.core.enums;
2 2
3 /** 3 /**
4 * Quartz Job Data 的 key 枚举 4 * Quartz Job Data 的 key 枚举
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/handler/JobHandler.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.quartz.core.handler; 1 +package cn.iocoder.yudao.framework.quartz.core.handler;
2 2
3 /** 3 /**
4 * 任务处理器 4 * 任务处理器
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/handler/JobHandlerInvoker.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.quartz.core.handler; 1 +package cn.iocoder.yudao.framework.quartz.core.handler;
2 2
3 import cn.hutool.core.lang.Assert; 3 import cn.hutool.core.lang.Assert;
4 import cn.hutool.core.thread.ThreadUtil; 4 import cn.hutool.core.thread.ThreadUtil;
5 -import cn.iocoder.dashboard.framework.quartz.core.enums.JobDataKeyEnum;  
6 -import cn.iocoder.dashboard.framework.quartz.core.service.JobLogFrameworkService; 5 +import cn.iocoder.yudao.framework.quartz.core.enums.JobDataKeyEnum;
  6 +import cn.iocoder.yudao.framework.quartz.core.service.JobLogFrameworkService;
7 import lombok.extern.slf4j.Slf4j; 7 import lombok.extern.slf4j.Slf4j;
8 import org.quartz.DisallowConcurrentExecution; 8 import org.quartz.DisallowConcurrentExecution;
9 import org.quartz.JobExecutionContext; 9 import org.quartz.JobExecutionContext;
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/scheduler/SchedulerManager.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.quartz.core.scheduler; 1 +package cn.iocoder.yudao.framework.quartz.core.scheduler;
2 2
3 -import cn.iocoder.dashboard.framework.quartz.core.enums.JobDataKeyEnum;  
4 -import cn.iocoder.dashboard.framework.quartz.core.handler.JobHandlerInvoker; 3 +import cn.iocoder.yudao.framework.quartz.core.enums.JobDataKeyEnum;
  4 +import cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker;
5 import org.quartz.*; 5 import org.quartz.*;
6 6
7 /** 7 /**
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/service/JobLogFrameworkService.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.quartz.core.service; 1 +package cn.iocoder.yudao.framework.quartz.core.service;
2 2
3 import javax.validation.constraints.NotEmpty; 3 import javax.validation.constraints.NotEmpty;
4 import javax.validation.constraints.NotNull; 4 import javax.validation.constraints.NotNull;
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/core/util/CronUtils.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.quartz.core.util; 1 +package cn.iocoder.yudao.framework.quartz.core.util;
2 2
3 import org.quartz.CronExpression; 3 import org.quartz.CronExpression;
4 4
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/package-info.java
  View file @a927dd0
@@ -2,4 +2,4 @@ @@ -2,4 +2,4 @@
2 * 定时任务，采用 Quartz 实现进程内的任务执行。 2 * 定时任务，采用 Quartz 实现进程内的任务执行。
3 * 考虑到高可用，使用 Quartz 自带的 MySQL 集群方案。 3 * 考虑到高可用，使用 Quartz 自带的 MySQL 集群方案。
4 */ 4 */
5 -package cn.iocoder.dashboard.framework.quartz; 5 +package cn.iocoder.yudao.framework.quartz;
yudao-framework/yudao-spring-boot-starter-job/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/TracerAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java
  View file @a927dd0
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration; @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
22 @ConditionalOnClass({BizTraceAspect.class}) 22 @ConditionalOnClass({BizTraceAspect.class})
23 @EnableConfigurationProperties(TracerProperties.class) 23 @EnableConfigurationProperties(TracerProperties.class)
24 @ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true) 24 @ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true)
25 -public class TracerAutoConfiguration { 25 +public class YudaoTracerAutoConfiguration {
26 26
27 @Bean 27 @Bean
28 @ConditionalOnMissingBean 28 @ConditionalOnMissingBean
yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration
yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md 0 → 100644
  View file @a927dd0
  1 +<https://www.iocoder.cn/Spring-Boot/Admin/?yudao>
yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md 0 → 100644
  View file @a927dd0
  1 +<https://www.iocoder.cn/Spring-Boot/Actuator/?yudao>
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md
  View file @a927dd0
yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
  View file @a927dd0
@@ -32,12 +32,6 @@ @@ -32,12 +32,6 @@
32 <scope>provided</scope> <!-- 设置为 provided，只有 OncePerRequestFilter 使用到 --> 32 <scope>provided</scope> <!-- 设置为 provided，只有 OncePerRequestFilter 使用到 -->
33 </dependency> 33 </dependency>
34 34
35 -<!-- <dependency>-->  
36 -<!-- <groupId>jakarta.servlet</groupId>-->  
37 -<!-- <artifactId>jakarta.servlet-api</artifactId>-->  
38 -<!-- <scope>provided</scope> &lt;!&ndash; 设置为 provided，只有 OncePerRequestFilter 使用到 &ndash;&gt;-->  
39 -<!-- </dependency>-->  
40 -  
41 <!-- DB 相关 --> 35 <!-- DB 相关 -->
42 <dependency> 36 <dependency>
43 <groupId>mysql</groupId> 37 <groupId>mysql</groupId>
yudao-framework/yudao-spring-boot-starter-protection/pom.xml
  View file @a927dd0
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
20 <dependency> 20 <dependency>
21 <groupId>cn.iocoder.boot</groupId> 21 <groupId>cn.iocoder.boot</groupId>
22 <artifactId>yudao-spring-boot-starter-redis</artifactId> 22 <artifactId>yudao-spring-boot-starter-redis</artifactId>
23 - <scope>provided</scope> <!-- 设置为 provider 范围，因为 IdempotentConfiguration 使用到 -->  
24 </dependency> 23 </dependency>
25 24
26 <!-- 服务保障相关 --> 25 <!-- 服务保障相关 -->
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/IdempotentConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java
  View file @a927dd0
@@ -15,7 +15,7 @@ import java.util.List; @@ -15,7 +15,7 @@ import java.util.List;
15 15
16 @Configuration(proxyBeanMethods = false) 16 @Configuration(proxyBeanMethods = false)
17 @AutoConfigureAfter(RedisAutoConfiguration.class) 17 @AutoConfigureAfter(RedisAutoConfiguration.class)
18 -public class IdempotentConfiguration { 18 +public class YudaoIdempotentConfiguration {
19 19
20 @Bean 20 @Bean
21 public IdempotentAspect idempotentAspect(List<IdempotentKeyResolver> keyResolvers, IdempotentRedisDAO idempotentRedisDAO) { 21 public IdempotentAspect idempotentAspect(List<IdempotentKeyResolver> keyResolvers, IdempotentRedisDAO idempotentRedisDAO) {
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/Lock4jConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/YudaoLock4jConfiguration.java
  View file @a927dd0
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean;
7 import org.springframework.context.annotation.Configuration; 7 import org.springframework.context.annotation.Configuration;
8 8
9 @Configuration 9 @Configuration
10 -public class Lock4jConfiguration { 10 +public class YudaoLock4jConfiguration {
11 11
12 static { 12 static {
13 // 手动加载 Lock4jRedisKeyConstants 类，因为它不会被使用到 13 // 手动加载 Lock4jRedisKeyConstants 类，因为它不会被使用到
yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration,\
  3 + cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration
yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/RedisConfig.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoRedisAutoConfiguration.java
  View file @a927dd0
@@ -24,7 +24,7 @@ import java.util.List; @@ -24,7 +24,7 @@ import java.util.List;
24 */ 24 */
25 @Configuration 25 @Configuration
26 @Slf4j 26 @Slf4j
27 -public class RedisConfig { 27 +public class YudaoRedisAutoConfiguration {
28 28
29 /** 29 /**
30 * 创建 RedisTemplate Bean，使用 JSON 序列化方式 30 * 创建 RedisTemplate Bean，使用 JSON 序列化方式
yudao-framework/yudao-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java 0 → 100644
  View file @a927dd0
  1 +package cn.iocoder.yudao.framework.security.config;
  2 +
  3 +import cn.iocoder.yudao.framework.security.core.filter.JwtAuthenticationTokenFilter;
  4 +import cn.iocoder.yudao.framework.security.core.handler.AccessDeniedHandlerImpl;
  5 +import cn.iocoder.yudao.framework.security.core.handler.AuthenticationEntryPointImpl;
  6 +import cn.iocoder.yudao.framework.security.core.handler.LogoutSuccessHandlerImpl;
  7 +import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService;
  8 +import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
  9 +import org.springframework.boot.context.properties.EnableConfigurationProperties;
  10 +import org.springframework.context.annotation.Bean;
  11 +import org.springframework.context.annotation.Configuration;
  12 +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
  13 +import org.springframework.security.crypto.password.PasswordEncoder;
  14 +import org.springframework.security.web.AuthenticationEntryPoint;
  15 +import org.springframework.security.web.access.AccessDeniedHandler;
  16 +import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
  17 +
  18 +import javax.annotation.Resource;
  19 +
  20 +/**
  21 + * Spring Security 自动配置类，主要用于相关组件的配置
  22 + *
  23 + * 注意，不能和 {@link YudaoWebSecurityConfigurerAdapter} 用一个，原因是会导致初始化报错。
  24 + * 参见 https://stackoverflow.com/questions/53847050/spring-boot-delegatebuilder-cannot-be-null-on-autowiring-authenticationmanager 文档。
  25 + *
  26 + * @author 芋道源码
  27 + */
  28 +@Configuration
  29 +@EnableConfigurationProperties(SecurityProperties.class)
  30 +public class YudaoSecurityAutoConfiguration {
  31 +
  32 + @Resource
  33 + private SecurityProperties securityProperties;
  34 +
  35 + /**
  36 + * 认证失败处理类 Bean
  37 + */
  38 + @Bean
  39 + public AuthenticationEntryPoint authenticationEntryPoint() {
  40 + return new AuthenticationEntryPointImpl();
  41 + }
  42 +
  43 + /**
  44 + * 权限不够处理器 Bean
  45 + */
  46 + @Bean
  47 + public AccessDeniedHandler accessDeniedHandler() {
  48 + return new AccessDeniedHandlerImpl();
  49 + }
  50 +
  51 + /**
  52 + * 退出处理类 Bean
  53 + */
  54 + @Bean
  55 + public LogoutSuccessHandler logoutSuccessHandler(SecurityAuthFrameworkService securityFrameworkService) {
  56 + return new LogoutSuccessHandlerImpl(securityProperties, securityFrameworkService);
  57 + }
  58 +
  59 + /**
  60 + * Spring Security 加密器
  61 + * 考虑到安全性，这里采用 BCryptPasswordEncoder 加密器
  62 + *
  63 + * @see <a href="http://stackabuse.com/password-encoding-with-spring-security/">Password Encoding with Spring Security</a>
  64 + */
  65 + @Bean
  66 + public PasswordEncoder passwordEncoder() {
  67 + return new BCryptPasswordEncoder();
  68 + }
  69 +
  70 + /**
  71 + * Token 认证过滤器 Bean
  72 + */
  73 + @Bean
  74 + public JwtAuthenticationTokenFilter authenticationTokenFilter(SecurityAuthFrameworkService securityFrameworkService,
  75 + GlobalExceptionHandler globalExceptionHandler) {
  76 + return new JwtAuthenticationTokenFilter(securityProperties, securityFrameworkService, globalExceptionHandler);
  77 + }
  78 +
  79 +}
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
  View file @a927dd0
1 package cn.iocoder.yudao.framework.security.config; 1 package cn.iocoder.yudao.framework.security.config;
2 2
3 import cn.iocoder.yudao.framework.security.core.filter.JwtAuthenticationTokenFilter; 3 import cn.iocoder.yudao.framework.security.core.filter.JwtAuthenticationTokenFilter;
  4 +import cn.iocoder.yudao.framework.security.core.handler.AccessDeniedHandlerImpl;
  5 +import cn.iocoder.yudao.framework.security.core.handler.AuthenticationEntryPointImpl;
4 import cn.iocoder.yudao.framework.security.core.handler.LogoutSuccessHandlerImpl; 6 import cn.iocoder.yudao.framework.security.core.handler.LogoutSuccessHandlerImpl;
  7 +import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService;
5 import cn.iocoder.yudao.framework.web.config.WebProperties; 8 import cn.iocoder.yudao.framework.web.config.WebProperties;
  9 +import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
6 import org.springframework.beans.factory.annotation.Value; 10 import org.springframework.beans.factory.annotation.Value;
7 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; 11 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
8 import org.springframework.boot.context.properties.EnableConfigurationProperties; 12 import org.springframework.boot.context.properties.EnableConfigurationProperties;
9 import org.springframework.context.annotation.Bean; 13 import org.springframework.context.annotation.Bean;
  14 +import org.springframework.context.annotation.Configuration;
10 import org.springframework.http.HttpMethod; 15 import org.springframework.http.HttpMethod;
11 import org.springframework.security.authentication.AuthenticationManager; 16 import org.springframework.security.authentication.AuthenticationManager;
12 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; 17 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -20,52 +25,56 @@ import org.springframework.security.crypto.password.PasswordEncoder; @@ -20,52 +25,56 @@ import org.springframework.security.crypto.password.PasswordEncoder;
20 import org.springframework.security.web.AuthenticationEntryPoint; 25 import org.springframework.security.web.AuthenticationEntryPoint;
21 import org.springframework.security.web.access.AccessDeniedHandler; 26 import org.springframework.security.web.access.AccessDeniedHandler;
22 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; 27 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
  28 +import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
23 29
24 import javax.annotation.Resource; 30 import javax.annotation.Resource;
25 31
26 /** 32 /**
27 - * spring security配置 33 + * 自定义的 Spring Security 配置适配器实现
28 * 34 *
29 * @author 芋道源码 35 * @author 芋道源码
30 */ 36 */
  37 +@Configuration
31 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) 38 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
32 -@EnableConfigurationProperties(SecurityProperties.class)  
33 -public class YudaoSecurityConfiguration extends WebSecurityConfigurerAdapter { 39 +public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
  40 +
  41 + @Resource
  42 + private WebProperties webProperties;
  43 +
  44 + @Value("${spring.boot.admin.context-path:''}")
  45 + private String adminSeverContextPath;
34 46
35 /** 47 /**
36 - * 自定义用户认证逻辑 48 + * 自定义用户【认证】逻辑
37 */ 49 */
38 @Resource 50 @Resource
39 private UserDetailsService userDetailsService; 51 private UserDetailsService userDetailsService;
40 -  
41 /** 52 /**
42 - * 认证失败处理类 53 + * Spring Security 加密器
  54 + */
  55 + @Resource
  56 + private PasswordEncoder passwordEncoder;
  57 + /**
  58 + * 认证失败处理类 Bean
43 */ 59 */
44 @Resource 60 @Resource
45 - private AuthenticationEntryPoint unauthorizedHandler; 61 + private AuthenticationEntryPoint authenticationEntryPoint;
46 /** 62 /**
47 - * 权限不够处理器 63 + * 权限不够处理器 Bean
48 */ 64 */
49 @Resource 65 @Resource
50 private AccessDeniedHandler accessDeniedHandler; 66 private AccessDeniedHandler accessDeniedHandler;
51 /** 67 /**
52 - * 退出处理类 68 + * 退出处理类 Bean
53 */ 69 */
54 @Resource 70 @Resource
55 - private LogoutSuccessHandlerImpl logoutSuccessHandler;  
56 - 71 + private LogoutSuccessHandler logoutSuccessHandler;
57 /** 72 /**
58 - * Token 认证过滤器 73 + * Token 认证过滤器 Bean
59 */ 74 */
60 @Resource 75 @Resource
61 private JwtAuthenticationTokenFilter authenticationTokenFilter; 76 private JwtAuthenticationTokenFilter authenticationTokenFilter;
62 77
63 - @Resource  
64 - private WebProperties webProperties;  
65 -  
66 - @Value("${spring.boot.admin.context-path:''}")  
67 - private String adminSeverContextPath;  
68 -  
69 /** 78 /**
70 * 由于 Spring Security 创建 AuthenticationManager 对象时，没声明 @Bean 注解，导致无法被注入 79 * 由于 Spring Security 创建 AuthenticationManager 对象时，没声明 @Bean 注解，导致无法被注入
71 * 通过覆写父类的该方法，添加 @Bean 注解，解决该问题 80 * 通过覆写父类的该方法，添加 @Bean 注解，解决该问题
@@ -78,23 +87,12 @@ public class YudaoSecurityConfiguration extends WebSecurityConfigurerAdapter { @@ -78,23 +87,12 @@ public class YudaoSecurityConfiguration extends WebSecurityConfigurerAdapter {
78 } 87 }
79 88
80 /** 89 /**
81 - * Spring Security 加密器  
82 - * 考虑到安全性，这里采用 BCryptPasswordEncoder 加密器  
83 - *  
84 - * @see <a href="http://stackabuse.com/password-encoding-with-spring-security/">Password Encoding with Spring Security</a>  
85 - */  
86 - @Bean  
87 - public PasswordEncoder passwordEncoder() {  
88 - return new BCryptPasswordEncoder();  
89 - }  
90 -  
91 - /**  
92 * 身份认证接口 90 * 身份认证接口
93 */ 91 */
94 @Override 92 @Override
95 protected void configure(AuthenticationManagerBuilder auth) throws Exception { 93 protected void configure(AuthenticationManagerBuilder auth) throws Exception {
96 auth.userDetailsService(userDetailsService) 94 auth.userDetailsService(userDetailsService)
97 - .passwordEncoder(passwordEncoder()); 95 + .passwordEncoder(passwordEncoder);
98 } 96 }
99 97
100 /** 98 /**
@@ -124,7 +122,7 @@ public class YudaoSecurityConfiguration extends WebSecurityConfigurerAdapter { @@ -124,7 +122,7 @@ public class YudaoSecurityConfiguration extends WebSecurityConfigurerAdapter {
124 // 基于 token 机制，所以不需要 Session 122 // 基于 token 机制，所以不需要 Session
125 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() 123 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
126 // 一堆自定义的 Spring Security 处理器 124 // 一堆自定义的 Spring Security 处理器
127 - .exceptionHandling().authenticationEntryPoint(unauthorizedHandler) 125 + .exceptionHandling().authenticationEntryPoint(authenticationEntryPoint)
128 .accessDeniedHandler(accessDeniedHandler).and() 126 .accessDeniedHandler(accessDeniedHandler).and()
129 // 设置每个请求的权限 127 // 设置每个请求的权限
130 .authorizeRequests() 128 .authorizeRequests()
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/JwtAuthenticationTokenFilter.java
  View file @a927dd0
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkSer @@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkSer
8 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; 8 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
9 import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; 9 import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
10 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; 10 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
  11 +import lombok.AllArgsConstructor;
11 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
12 import org.springframework.web.filter.OncePerRequestFilter; 13 import org.springframework.web.filter.OncePerRequestFilter;
13 14
@@ -24,15 +25,14 @@ import java.io.IOException; @@ -24,15 +25,14 @@ import java.io.IOException;
24 * 25 *
25 * @author ruoyi 26 * @author ruoyi
26 */ 27 */
27 -@Component 28 +@AllArgsConstructor
28 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { 29 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
29 30
30 - @Resource  
31 - private SecurityProperties securityProperties;  
32 - @Resource  
33 - private SecurityAuthFrameworkService authService;  
34 - @Resource  
35 - private GlobalExceptionHandler globalExceptionHandler; 31 + private final SecurityProperties securityProperties;
  32 +
  33 + private final SecurityAuthFrameworkService authService;
  34 +
  35 + private final GlobalExceptionHandler globalExceptionHandler;
36 36
37 @Override 37 @Override
38 @SuppressWarnings("NullableProblems") 38 @SuppressWarnings("NullableProblems")
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AccessDeniedHandlerImpl.java
  View file @a927dd0
@@ -25,7 +25,6 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC @@ -25,7 +25,6 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
25 * 25 *
26 * @author 芋道源码 26 * @author 芋道源码
27 */ 27 */
28 -@Component  
29 @Slf4j 28 @Slf4j
30 @SuppressWarnings("JavadocReference") 29 @SuppressWarnings("JavadocReference")
31 public class AccessDeniedHandlerImpl implements AccessDeniedHandler { 30 public class AccessDeniedHandlerImpl implements AccessDeniedHandler {
@@ -35,7 +34,7 @@ public class AccessDeniedHandlerImpl implements AccessDeniedHandler { @@ -35,7 +34,7 @@ public class AccessDeniedHandlerImpl implements AccessDeniedHandler {
35 throws IOException, ServletException { 34 throws IOException, ServletException {
36 // 打印 warn 的原因是，不定期合并 warn，看看有没恶意破坏 35 // 打印 warn 的原因是，不定期合并 warn，看看有没恶意破坏
37 log.warn("[commence][访问 URL({}) 时，用户({}) 权限不够]", request.getRequestURI(), 36 log.warn("[commence][访问 URL({}) 时，用户({}) 权限不够]", request.getRequestURI(),
38 - SecurityFrameworkUtils.getLoginUser().getId(), e); 37 + SecurityFrameworkUtils.getLoginUserId(), e);
39 // 返回 403 38 // 返回 403
40 ServletUtils.writeJSON(response, CommonResult.error(UNAUTHORIZED)); 39 ServletUtils.writeJSON(response, CommonResult.error(UNAUTHORIZED));
41 } 40 }
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AuthenticationEntryPointImpl.java
  View file @a927dd0
@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j; @@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
7 import org.springframework.security.core.AuthenticationException; 7 import org.springframework.security.core.AuthenticationException;
8 import org.springframework.security.web.AuthenticationEntryPoint; 8 import org.springframework.security.web.AuthenticationEntryPoint;
9 import org.springframework.security.web.access.ExceptionTranslationFilter; 9 import org.springframework.security.web.access.ExceptionTranslationFilter;
10 -import org.springframework.stereotype.Component;  
11 10
12 import javax.servlet.FilterChain; 11 import javax.servlet.FilterChain;
13 import javax.servlet.http.HttpServletRequest; 12 import javax.servlet.http.HttpServletRequest;
@@ -22,7 +21,6 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC @@ -22,7 +21,6 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
22 * 21 *
23 * @author ruoyi 22 * @author ruoyi
24 */ 23 */
25 -@Component  
26 @Slf4j 24 @Slf4j
27 @SuppressWarnings("JavadocReference") // 忽略文档引用报错 25 @SuppressWarnings("JavadocReference") // 忽略文档引用报错
28 public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint { 26 public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint {
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/LogoutSuccessHandlerImpl.java
  View file @a927dd0
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.security.config.SecurityProperties; @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.security.config.SecurityProperties;
6 import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService; 6 import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService;
7 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; 7 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
8 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; 8 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
  9 +import lombok.AllArgsConstructor;
9 import org.springframework.security.core.Authentication; 10 import org.springframework.security.core.Authentication;
10 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; 11 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
11 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
@@ -20,14 +21,12 @@ import javax.servlet.http.HttpServletResponse; @@ -20,14 +21,12 @@ import javax.servlet.http.HttpServletResponse;
20 * 21 *
21 * @author ruoyi 22 * @author ruoyi
22 */ 23 */
23 -@Component 24 +@AllArgsConstructor
24 public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler { 25 public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler {
25 26
26 - @Resource  
27 - private SecurityProperties securityProperties; 27 + private final SecurityProperties securityProperties;
28 28
29 - @Resource  
30 - private SecurityAuthFrameworkService securityFrameworkService; 29 + private final SecurityAuthFrameworkService securityFrameworkService;
31 30
32 @Override 31 @Override
33 public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { 32 public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration,\
  3 + cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/ut/BaseMockitoUnitTest.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseMockitoUnitTest.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.test.core.ut; 1 +package cn.iocoder.yudao.framework.test.core.ut;
2 2
3 import org.junit.jupiter.api.extension.ExtendWith; 3 import org.junit.jupiter.api.extension.ExtendWith;
4 import org.mockito.junit.jupiter.MockitoExtension; 4 import org.mockito.junit.jupiter.MockitoExtension;
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/ut/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/package-info.java
  View file @a927dd0
1 /** 1 /**
2 * 提供单元测试 Unit Test 的基类 2 * 提供单元测试 Unit Test 的基类
3 */ 3 */
4 -package cn.iocoder.dashboard.framework.test.core.ut; 4 +package cn.iocoder.yudao.framework.test.core.ut;
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/AssertUtils.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.test.core.util; 1 +package cn.iocoder.yudao.framework.test.core.util;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 import cn.hutool.core.util.ReflectUtil; 4 import cn.hutool.core.util.ReflectUtil;
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
  View file @a927dd0
1 -package cn.iocoder.dashboard.framework.test.core.util; 1 +package cn.iocoder.yudao.framework.test.core.util;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 import cn.hutool.core.util.RandomUtil; 4 import cn.hutool.core.util.RandomUtil;
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/package-info.java
  View file @a927dd0
1 /** 1 /**
2 * 测试组件，用于单元测试、集成测试等等 2 * 测试组件，用于单元测试、集成测试等等
3 */ 3 */
4 -package cn.iocoder.dashboard.framework.test; 4 +package cn.iocoder.yudao.framework.test;
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java
  View file @a927dd0
@@ -29,7 +29,7 @@ public class WebProperties { @@ -29,7 +29,7 @@ public class WebProperties {
29 * 29 *
30 * 主要目的是，给该 Controller 设置指定的 {@link #apiPrefix} 30 * 主要目的是，给该 Controller 设置指定的 {@link #apiPrefix}
31 * 31 *
32 - * 因为我们有多个 modules 包里会包含 Controller，所以只需要写到 cn.iocoder.dashboard 这样的层级 32 + * 因为我们有多个 modules 包里会包含 Controller，所以只需要写到 cn.iocoder.yudao 这样的层级
33 */ 33 */
34 @NotNull(message = "Controller 所在包不能为空") 34 @NotNull(message = "Controller 所在包不能为空")
35 private String controllerPackage; 35 private String controllerPackage;
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
  View file @a927dd0
1 package cn.iocoder.yudao.framework.web.config; 1 package cn.iocoder.yudao.framework.web.config;
2 2
  3 +import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService;
3 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; 4 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
4 import cn.iocoder.yudao.framework.web.core.filter.CacheRequestBodyFilter; 5 import cn.iocoder.yudao.framework.web.core.filter.CacheRequestBodyFilter;
5 import cn.iocoder.yudao.framework.web.core.filter.DemoFilter; 6 import cn.iocoder.yudao.framework.web.core.filter.DemoFilter;
6 import cn.iocoder.yudao.framework.web.core.filter.XssFilter; 7 import cn.iocoder.yudao.framework.web.core.filter.XssFilter;
  8 +import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
  9 +import cn.iocoder.yudao.framework.web.core.handler.GlobalResponseBodyHandler;
  10 +import org.springframework.beans.factory.annotation.Value;
7 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 11 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
8 import org.springframework.boot.context.properties.EnableConfigurationProperties; 12 import org.springframework.boot.context.properties.EnableConfigurationProperties;
9 import org.springframework.boot.web.servlet.FilterRegistrationBean; 13 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -26,6 +30,11 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer { @@ -26,6 +30,11 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
26 30
27 @Resource 31 @Resource
28 private WebProperties webProperties; 32 private WebProperties webProperties;
  33 + /**
  34 + * 应用名
  35 + */
  36 + @Value("${spring.application.name}")
  37 + private String applicationName;
29 38
30 @Override 39 @Override
31 public void configurePathMatch(PathMatchConfigurer configurer) { 40 public void configurePathMatch(PathMatchConfigurer configurer) {
@@ -35,6 +44,16 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer { @@ -35,6 +44,16 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
35 && clazz.getPackage().getName().startsWith(webProperties.getControllerPackage())); // 仅仅匹配 controller 包 44 && clazz.getPackage().getName().startsWith(webProperties.getControllerPackage())); // 仅仅匹配 controller 包
36 } 45 }
37 46
  47 + @Bean
  48 + public GlobalExceptionHandler globalExceptionHandler(ApiErrorLogFrameworkService ApiErrorLogFrameworkService) {
  49 + return new GlobalExceptionHandler(applicationName, ApiErrorLogFrameworkService);
  50 + }
  51 +
  52 + @Bean
  53 + public GlobalResponseBodyHandler globalResponseBodyHandler() {
  54 + return new GlobalResponseBodyHandler();
  55 + }
  56 +
38 // ========== Filter 相关 ========== 57 // ========== Filter 相关 ==========
39 58
40 /** 59 /**
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
  View file @a927dd0
@@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; @@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
12 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 12 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
13 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; 13 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
14 import io.github.resilience4j.ratelimiter.RequestNotPermitted; 14 import io.github.resilience4j.ratelimiter.RequestNotPermitted;
  15 +import lombok.AllArgsConstructor;
15 import lombok.extern.slf4j.Slf4j; 16 import lombok.extern.slf4j.Slf4j;
16 import org.apache.commons.lang3.exception.ExceptionUtils; 17 import org.apache.commons.lang3.exception.ExceptionUtils;
17 import org.springframework.beans.factory.annotation.Value; 18 import org.springframework.beans.factory.annotation.Value;
@@ -43,14 +44,13 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC @@ -43,14 +44,13 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
43 * @author 芋道源码 44 * @author 芋道源码
44 */ 45 */
45 @RestControllerAdvice 46 @RestControllerAdvice
  47 +@AllArgsConstructor
46 @Slf4j 48 @Slf4j
47 public class GlobalExceptionHandler { 49 public class GlobalExceptionHandler {
48 50
49 - @Value("${spring.application.name}")  
50 - private String applicationName; 51 + private final String applicationName;
51 52
52 - @Resource  
53 - private ApiErrorLogFrameworkService apiErrorLogFrameworkService; 53 + private final ApiErrorLogFrameworkService apiErrorLogFrameworkService;
54 54
55 /** 55 /**
56 * 处理所有异常，主要是提供给 Filter 使用 56 * 处理所有异常，主要是提供给 Filter 使用
yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring.factories 0 → 100644
  View file @a927dd0
  1 +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  2 + cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration,\
  3 + cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration,\
  4 + cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration,\
  5 + cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration