diff --git a/ LICENSE b/LICENSE similarity index 100% rename from LICENSE rename to LICENSE diff --git a/common/pom.xml b/common/pom.xml index 91af6ed..360b4b0 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ common Maven Webapp https://maven.apache.org - service-utils + common-generator @@ -22,10 +22,6 @@ dao 0.0.1-SNAPSHOT - - org.springframework.boot - spring-boot-starter-web - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/common/service-utils/pom.xml b/common/service-utils/pom.xml deleted file mode 100644 index f846523..0000000 --- a/common/service-utils/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - 4.0.0 - - cn.bunny - common - 0.0.1-SNAPSHOT - - - service-utils - jar - service-utils - https://maven.apache.org - - - UTF-8 - - - - - - javax.xml.bind - jaxb-api - 2.3.1 - - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - org.redisson - redisson - 3.26.1 - - - - io.minio - minio - - - - org.lionsoul - ip2region - 2.6.5 - - - - org.springframework - spring-websocket - - - - org.springframework.boot - spring-boot-starter-mail - - - - org.springframework.boot - spring-boot-starter-validation - - - diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java index f369e25..3a0171e 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/user/LoginDto.java @@ -41,4 +41,5 @@ public class LoginDto { @Schema(name = "readMeDay", title = "记住我的天数") private Long readMeDay = 1L; + } diff --git a/dao/src/main/java/cn/bunny/dao/entity/quartz/Schedulers.java b/dao/src/main/java/cn/bunny/dao/entity/quartz/Schedulers.java index 994d4e2..fa88247 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/quartz/Schedulers.java +++ b/dao/src/main/java/cn/bunny/dao/entity/quartz/Schedulers.java @@ -1,5 +1,7 @@ package cn.bunny.dao.entity.quartz; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; @@ -24,6 +26,7 @@ import java.io.Serializable; public class Schedulers implements Serializable { @Schema(name = "jobName", title = "任务名称") + @TableId(type = IdType.NONE) private String jobName; @Schema(name = "jobGroup", title = "任务分组") diff --git a/pom.xml b/pom.xml index 5b761e1..0667940 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,19 @@ 17 3.8.1 3.5.6 - 8.0.30 + 8.0.33 4.5.0 2.0.47 - 8.5.9 + 8.5.17 1.18.32 0.9.1 - 3.3.3 + 4.0.2 2.10.1 1.9.21 6.1.0 2.2 3.1 - 5.1.0 + 6.2.1 4.3.1 2.12.3 2.3.2 @@ -188,5 +188,4 @@ - diff --git a/service/pom.xml b/service/pom.xml index aad4de0..2d8c695 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -14,61 +14,20 @@ UTF-8 - 192.168.3.98:1100 - 192.168.3.98:2375 bunny-service cn.bunny - service-utils + dao 0.0.1-SNAPSHOT - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - org.springframework.boot - spring-boot-starter-security - - - - org.springframework.security - spring-security-test - - + org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - 3.2.3 - - - - junit - junit - 3.8.1 - - - - org.springframework.boot - spring-boot-starter-test - org.aspectj @@ -78,31 +37,135 @@ org.aspectj aspectjweaver - + + org.springframework.boot + spring-boot-devtools + runtime + true + + + + org.quartz-scheduler + quartz + + + + + junit + junit + 3.8.1 + + + org.springframework.boot + spring-boot-starter-test + + + org.springframework.security + spring-security-test + + + + + + + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-mail + + org.springframework.boot spring-boot-starter-websocket + + org.springframework + spring-websocket + + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-actuator + 3.2.3 + + + + + cn.hutool + hutool-all + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + + + mysql + mysql-connector-java + - + - org.quartz-scheduler - quartz + org.springframework.boot + spring-boot-starter-data-redis + + + + io.minio + minio + + + + + io.jsonwebtoken + jjwt + + + + org.lionsoul + ip2region + 2.6.5 + + + + + org.springframework + spring-context-support + 6.1.6 + + + + javax.xml.bind + jaxb-api + 2.3.1 com.mchange c3p0 0.9.5.5 - - org.springframework - spring-context-support - 6.1.6 + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 diff --git a/service/src/main/java/cn/bunny/services/ServiceApplication.java b/service/src/main/java/cn/bunny/services/AuthServiceApplication.java similarity index 86% rename from service/src/main/java/cn/bunny/services/ServiceApplication.java rename to service/src/main/java/cn/bunny/services/AuthServiceApplication.java index 7a875f5..e1635c1 100644 --- a/service/src/main/java/cn/bunny/services/ServiceApplication.java +++ b/service/src/main/java/cn/bunny/services/AuthServiceApplication.java @@ -14,8 +14,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableCaching @EnableTransactionManagement @SpringBootApplication -public class ServiceApplication { +public class AuthServiceApplication { public static void main(String[] args) { - SpringApplication.run(ServiceApplication.class, args); + SpringApplication.run(AuthServiceApplication.class, args); } } diff --git a/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java b/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java index 85273a2..2e874a2 100644 --- a/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java +++ b/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java @@ -1,7 +1,7 @@ package cn.bunny.services.aop; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.type.filter.AnnotationTypeFilter; @@ -12,7 +12,7 @@ import java.util.HashSet; import java.util.Set; /** - * * 扫描指定目录下所有类 + * 扫描指定目录下所有类 */ @Component public class AnnotationScanner { diff --git a/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java b/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java index 1d9bb58..cb30b16 100644 --- a/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java +++ b/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java @@ -104,5 +104,4 @@ public class JobExecuteAspect { @Pointcut("execution(* cn.bunny.services.quartz.*.execute(..))") public void pointCut() { } - } diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/ControllerStringParamTrimConfig.java b/service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java similarity index 98% rename from common/service-utils/src/main/java/cn/bunny/common/service/config/ControllerStringParamTrimConfig.java rename to service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java index 8f393dc..cec6403 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/ControllerStringParamTrimConfig.java +++ b/service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.config; +package cn.bunny.services.config; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java b/service/src/main/java/cn/bunny/services/config/Knife4jConfig.java similarity index 98% rename from common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java rename to service/src/main/java/cn/bunny/services/config/Knife4jConfig.java index 1130b53..c2daf93 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java +++ b/service/src/main/java/cn/bunny/services/config/Knife4jConfig.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.config; +package cn.bunny.services.config; import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/MyBatisPlusFieldConfig.java b/service/src/main/java/cn/bunny/services/config/MyBatisPlusFieldConfig.java similarity index 93% rename from common/service-utils/src/main/java/cn/bunny/common/service/config/MyBatisPlusFieldConfig.java rename to service/src/main/java/cn/bunny/services/config/MyBatisPlusFieldConfig.java index 6f6e278..02c2937 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/MyBatisPlusFieldConfig.java +++ b/service/src/main/java/cn/bunny/services/config/MyBatisPlusFieldConfig.java @@ -1,6 +1,6 @@ -package cn.bunny.common.service.config; +package cn.bunny.services.config; -import cn.bunny.common.service.context.BaseContext; +import cn.bunny.services.context.BaseContext; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java b/service/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java similarity index 97% rename from common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java rename to service/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java index beb7258..5dca69f 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java +++ b/service/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.config; +package cn.bunny.services.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/RedisConfiguration.java b/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java similarity index 98% rename from common/service-utils/src/main/java/cn/bunny/common/service/config/RedisConfiguration.java rename to service/src/main/java/cn/bunny/services/config/RedisConfiguration.java index be3f46b..b18a840 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/RedisConfiguration.java +++ b/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.config; +package cn.bunny.services.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; @@ -52,7 +52,7 @@ public class RedisConfiguration { redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer()); // 开启Redis事务 - redisTemplate.setEnableTransactionSupport(true); + // redisTemplate.setEnableTransactionSupport(true); return redisTemplate; } diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/context/BaseContext.java b/service/src/main/java/cn/bunny/services/context/BaseContext.java similarity index 95% rename from common/service-utils/src/main/java/cn/bunny/common/service/context/BaseContext.java rename to service/src/main/java/cn/bunny/services/context/BaseContext.java index 949c520..4276cc3 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/context/BaseContext.java +++ b/service/src/main/java/cn/bunny/services/context/BaseContext.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.context; +package cn.bunny.services.context; import cn.bunny.dao.vo.system.user.LoginVo; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/AuthCustomerException.java b/service/src/main/java/cn/bunny/services/exception/AuthCustomerException.java similarity index 95% rename from common/service-utils/src/main/java/cn/bunny/common/service/exception/AuthCustomerException.java rename to service/src/main/java/cn/bunny/services/exception/AuthCustomerException.java index 07ba0f7..7c2fd94 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/AuthCustomerException.java +++ b/service/src/main/java/cn/bunny/services/exception/AuthCustomerException.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.exception; +package cn.bunny.services.exception; import cn.bunny.dao.vo.result.ResultCodeEnum; import lombok.Getter; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java b/service/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java similarity index 79% rename from common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java rename to service/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java index 7c42b49..a02e299 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java +++ b/service/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java @@ -1,10 +1,11 @@ -package cn.bunny.common.service.exception; +package cn.bunny.services.exception; -import cn.bunny.common.service.context.BaseContext; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.context.BaseContext; import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.MyBatisSystemException; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.util.StringUtils; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -38,7 +39,8 @@ public class GlobalExceptionHandler { public Result exceptionHandler(RuntimeException exception) { String message = exception.getMessage(); message = StringUtils.hasText(message) ? message : "服务器异常"; - + exception.printStackTrace(); + // 解析异常 String jsonParseError = "JSON parse error (.*)"; Matcher jsonParseErrorMatcher = Pattern.compile(jsonParseError).matcher(message); @@ -67,36 +69,14 @@ public class GlobalExceptionHandler { return Result.error(null, 500, "表达式 " + cronExpressionMatcher.group(1) + " 不合法"); } + if (exception instanceof MyBatisSystemException) { + return Result.error(null, 500, "数据库异常"); + } + log.error("GlobalExceptionHandler===>运行时异常信息：{}", message); - exception.printStackTrace(); return Result.error(null, 500, message); } - // 捕获系统异常 - @ExceptionHandler(Exception.class) - @ResponseBody - public Result error(Exception exception) { - log.error("捕获系统异常：{}", exception.getMessage()); - log.error("GlobalExceptionHandler===>系统异常信息：{}", (Object) exception.getStackTrace()); - - // 错误消息 - String message = exception.getMessage(); - - // 匹配到内容 - String patternString = "Request method '(\\w+)' is not supported"; - Matcher matcher = Pattern.compile(patternString).matcher(message); - if (matcher.find()) return Result.error(null, 500, "请求方法错误，不是 " + matcher.group(1) + "类型请求"); - - // 请求API不存在 - String noStaticResource = "No static resource (.*)\\."; - Matcher noStaticResourceMatcher = Pattern.compile(noStaticResource).matcher(message); - if (noStaticResourceMatcher.find()) - return Result.error(null, 500, "请求API不存在 " + noStaticResourceMatcher.group(1)); - - // 返回错误内容 - return Result.error(null, 500, "系统异常"); - } - // 表单验证字段 @ExceptionHandler(MethodArgumentNotValidException.class) public Result handleValidationExceptions(MethodArgumentNotValidException ex) { diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java index f7efefb..c833013 100644 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java @@ -1,14 +1,14 @@ package cn.bunny.services.security.custom; -import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.entity.system.Power; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; +import cn.bunny.services.context.BaseContext; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.mapper.RoleMapper; +import cn.bunny.services.utils.JwtHelper; import cn.bunny.services.utils.RoleUtil; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; diff --git a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java index 70f2241..9d5a8ed 100644 --- a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java +++ b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java @@ -1,7 +1,5 @@ package cn.bunny.services.security.filter; - -import cn.bunny.common.service.utils.ResponseUtil; import cn.bunny.dao.dto.system.user.LoginDto; import cn.bunny.dao.enums.LoginEnums; import cn.bunny.dao.vo.result.Result; @@ -9,6 +7,7 @@ import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.security.handelr.SecurityAuthenticationFailureHandler; import cn.bunny.services.security.handelr.SecurityAuthenticationSuccessHandler; import cn.bunny.services.service.UserService; +import cn.bunny.services.utils.ResponseUtil; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; import jakarta.servlet.http.HttpServletRequest; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java index 2b05731..e02b5a9 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java @@ -1,9 +1,9 @@ package cn.bunny.services.security.handelr; -import cn.bunny.common.service.utils.ResponseUtil; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.security.custom.CustomAuthenticationException; +import cn.bunny.services.utils.ResponseUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java index 1f44ef3..befe577 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.dto.system.configuration.WebConfigurationDto; import cn.bunny.dao.entity.configuration.WebConfiguration; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.service.ConfigurationService; import com.alibaba.fastjson2.JSON; import org.springframework.beans.BeanUtils; diff --git a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java index 8a38ffa..6af3c06 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; import cn.bunny.dao.dto.system.dept.DeptUpdateDto; @@ -8,6 +7,7 @@ import cn.bunny.dao.entity.system.Dept; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.DeptVo; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.DeptMapper; import cn.bunny.services.mapper.UserDeptMapper; import cn.bunny.services.service.DeptService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java index 0563e4e..b60c0ab 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; @@ -9,6 +8,7 @@ import cn.bunny.dao.enums.EmailTemplateEnums; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailTemplateVo; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.EmailTemplateMapper; import cn.bunny.services.service.EmailTemplateService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java index e1c5f3d..ffc884d 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; import cn.bunny.dao.dto.system.email.user.EmailUsersDto; @@ -9,6 +8,7 @@ import cn.bunny.dao.entity.system.EmailUsers; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailUsersVo; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.EmailUsersMapper; import cn.bunny.services.service.EmailUsersService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java index 79431a6..abda9c7 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java @@ -1,10 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.common.service.utils.FileUtil; -import cn.bunny.common.service.utils.minio.MinioProperties; -import cn.bunny.common.service.utils.minio.MinioUtil; import cn.bunny.dao.dto.system.files.FileUploadDto; import cn.bunny.dao.dto.system.files.FilesAddDto; import cn.bunny.dao.dto.system.files.FilesDto; @@ -15,8 +10,13 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.files.FileInfoVo; import cn.bunny.dao.vo.system.files.FilesVo; +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.FilesMapper; import cn.bunny.services.service.FilesService; +import cn.bunny.services.utils.FileUtil; +import cn.bunny.services.utils.minio.MinioProperties; +import cn.bunny.services.utils.minio.MinioUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java index ef6208a..6e31717 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.i18n.I18nAddDto; import cn.bunny.dao.dto.i18n.I18nDto; import cn.bunny.dao.dto.i18n.I18nUpdateDto; @@ -9,6 +8,7 @@ import cn.bunny.dao.entity.i18n.I18nType; import cn.bunny.dao.vo.i18n.I18nVo; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.I18nMapper; import cn.bunny.services.mapper.I18nTypeMapper; import cn.bunny.services.service.I18nService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java index 7f63216..b6abdb4 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java @@ -1,12 +1,12 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.i18n.I18nTypeAddDto; import cn.bunny.dao.dto.i18n.I18nTypeDto; import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto; import cn.bunny.dao.entity.i18n.I18nType; import cn.bunny.dao.vo.i18n.I18nTypeVo; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.I18nTypeMapper; import cn.bunny.services.service.I18nTypeService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java index a3c5def..6207d5b 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconUpdateDto; @@ -8,6 +7,7 @@ import cn.bunny.dao.entity.system.MenuIcon; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.MenuIconVo; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.MenuIconMapper; import cn.bunny.services.service.MenuIconService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java index 7b064a3..29120d1 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java @@ -1,7 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto; import cn.bunny.dao.dto.system.message.MessageUserDto; @@ -11,6 +9,8 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageUserVo; +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.MessageReceivedMapper; import cn.bunny.services.service.MessageReceivedService; import cn.bunny.services.utils.UserUtil; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java index 296983c..ef79867 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java @@ -1,7 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.message.MessageAddDto; import cn.bunny.dao.dto.system.message.MessageDto; import cn.bunny.dao.dto.system.message.MessageUpdateDto; @@ -14,6 +12,8 @@ import cn.bunny.dao.vo.system.message.MessageDetailVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo; import cn.bunny.dao.vo.system.message.MessageVo; +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.MessageMapper; import cn.bunny.services.mapper.MessageReceivedMapper; import cn.bunny.services.mapper.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java index 700685d..d5e7e4d 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto; @@ -9,6 +8,7 @@ import cn.bunny.dao.entity.system.Power; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.PowerVo; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.mapper.RolePowerMapper; import cn.bunny.services.service.PowerService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java index 8ec73c5..6188dae 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto; @@ -9,6 +8,7 @@ import cn.bunny.dao.entity.system.UserRole; import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.RoleVo; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.RoleMapper; import cn.bunny.services.mapper.RolePowerMapper; import cn.bunny.services.mapper.RouterRoleMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java index 8b9ec94..5b2c8d1 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto; import cn.bunny.dao.entity.system.RouterRole; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.RouterRoleMapper; import cn.bunny.services.service.RouterRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java index ce47750..31439ce 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java @@ -1,7 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.router.RouterAddDto; import cn.bunny.dao.dto.system.router.RouterManageDto; import cn.bunny.dao.dto.system.router.RouterUpdateByIdWithRankDto; @@ -15,6 +13,8 @@ import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.router.RouterManageVo; import cn.bunny.dao.vo.system.router.RouterMeta; import cn.bunny.dao.vo.system.router.UserRouterVo; +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.RoleMapper; import cn.bunny.services.mapper.RolePowerMapper; import cn.bunny.services.mapper.RouterMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java index 3464c09..dbb8f54 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java @@ -1,6 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.quartz.SchedulersOperationDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersDto; @@ -11,6 +10,7 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.aop.AnnotationScanner; import cn.bunny.services.aop.annotation.QuartzSchedulers; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.SchedulersMapper; import cn.bunny.services.service.SchedulersService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java index e9b4b98..4d7689a 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.context.BaseContext; import cn.bunny.dao.dto.log.UserLoginLogDto; import cn.bunny.dao.entity.log.UserLoginLog; import cn.bunny.dao.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.services.context.BaseContext; import cn.bunny.services.mapper.UserLoginLogMapper; import cn.bunny.services.service.UserLoginLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java index 4ce201d..339687c 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java @@ -1,13 +1,13 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto; import cn.bunny.dao.entity.system.AdminUser; import cn.bunny.dao.entity.system.UserRole; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.UserMapper; import cn.bunny.services.mapper.UserRoleMapper; import cn.bunny.services.service.UserRoleService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java index b39ba25..c426e9e 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java @@ -1,9 +1,5 @@ package cn.bunny.services.service.impl; -import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.common.service.utils.JwtHelper; -import cn.bunny.common.service.utils.ip.IpUtil; import cn.bunny.dao.constant.MinioConstant; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.dto.system.files.FileUploadDto; @@ -19,11 +15,15 @@ import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.files.FileInfoVo; import cn.bunny.dao.vo.system.user.*; +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.*; import cn.bunny.services.service.FilesService; import cn.bunny.services.service.UserService; +import cn.bunny.services.utils.JwtHelper; import cn.bunny.services.utils.UserUtil; import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate; +import cn.bunny.services.utils.ip.IpUtil; import cn.bunny.services.utils.login.DefaultLoginStrategy; import cn.bunny.services.utils.login.EmailLoginStrategy; import cn.bunny.services.utils.login.LoginContext; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/FileUtil.java b/service/src/main/java/cn/bunny/services/utils/FileUtil.java similarity index 96% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/FileUtil.java rename to service/src/main/java/cn/bunny/services/utils/FileUtil.java index 3daf5cd..37ba6cf 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/FileUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/FileUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.utils; +package cn.bunny.services.utils; import org.springframework.stereotype.Component; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/JwtHelper.java b/service/src/main/java/cn/bunny/services/utils/JwtHelper.java similarity index 99% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/JwtHelper.java rename to service/src/main/java/cn/bunny/services/utils/JwtHelper.java index e6160b5..90857b0 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/JwtHelper.java +++ b/service/src/main/java/cn/bunny/services/utils/JwtHelper.java @@ -1,7 +1,7 @@ -package cn.bunny.common.service.utils; +package cn.bunny.services.utils; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import io.jsonwebtoken.*; import io.micrometer.common.lang.Nullable; import org.springframework.util.StringUtils; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java b/service/src/main/java/cn/bunny/services/utils/ResponseUtil.java similarity index 95% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java rename to service/src/main/java/cn/bunny/services/utils/ResponseUtil.java index 7626543..74f2417 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/ResponseUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.utils; +package cn.bunny.services.utils; import cn.bunny.dao.vo.result.Result; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/service/src/main/java/cn/bunny/services/utils/RoleUtil.java b/service/src/main/java/cn/bunny/services/utils/RoleUtil.java index 78e373f..0f881ed 100644 --- a/service/src/main/java/cn/bunny/services/utils/RoleUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/RoleUtil.java @@ -1,8 +1,8 @@ package cn.bunny.services.utils; -import cn.bunny.common.service.context.BaseContext; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.entity.system.AdminUser; +import cn.bunny.services.context.BaseContext; import cn.bunny.services.mapper.UserMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/utils/UserUtil.java b/service/src/main/java/cn/bunny/services/utils/UserUtil.java index 849388a..19f4ee1 100644 --- a/service/src/main/java/cn/bunny/services/utils/UserUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/UserUtil.java @@ -1,9 +1,5 @@ package cn.bunny.services.utils; -import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.common.service.utils.JwtHelper; -import cn.bunny.common.service.utils.ip.IpUtil; -import cn.bunny.common.service.utils.minio.MinioUtil; import cn.bunny.dao.constant.LocalDateTimeConstant; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.constant.UserConstant; @@ -12,10 +8,13 @@ import cn.bunny.dao.entity.system.AdminUser; import cn.bunny.dao.entity.system.Power; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.vo.system.user.LoginVo; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.mapper.RoleMapper; import cn.bunny.services.mapper.UserLoginLogMapper; import cn.bunny.services.mapper.UserMapper; +import cn.bunny.services.utils.ip.IpUtil; +import cn.bunny.services.utils.minio.MinioUtil; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java index f12b8ae..2eba3f3 100644 --- a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java @@ -1,13 +1,13 @@ package cn.bunny.services.utils.email; -import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.common.service.utils.mail.MailSenderUtil; import cn.bunny.dao.entity.system.EmailTemplate; import cn.bunny.dao.entity.system.EmailUsers; import cn.bunny.dao.model.email.EmailSend; import cn.bunny.dao.model.email.EmailSendInit; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.EmailUsersMapper; +import cn.bunny.services.utils.mail.MailSenderUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.mail.MessagingException; import org.springframework.beans.BeanUtils; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpEntity.java b/service/src/main/java/cn/bunny/services/utils/ip/IpEntity.java similarity index 92% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpEntity.java rename to service/src/main/java/cn/bunny/services/utils/ip/IpEntity.java index 88d3f9d..745577a 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpEntity.java +++ b/service/src/main/java/cn/bunny/services/utils/ip/IpEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.utils.ip; +package cn.bunny.services.utils.ip; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpUtil.java b/service/src/main/java/cn/bunny/services/utils/ip/IpUtil.java similarity index 99% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpUtil.java rename to service/src/main/java/cn/bunny/services/utils/ip/IpUtil.java index 305fabc..1f1bbc3 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ip/IpUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/ip/IpUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.utils.ip; +package cn.bunny.services.utils.ip; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java b/service/src/main/java/cn/bunny/services/utils/mail/MailSenderUtil.java similarity index 98% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java rename to service/src/main/java/cn/bunny/services/utils/mail/MailSenderUtil.java index 41346a9..e881d95 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/mail/MailSenderUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.utils.mail; +package cn.bunny.services.utils.mail; import cn.bunny.dao.model.email.EmailSend; import cn.bunny.dao.model.email.EmailSendInit; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/template-propties b/service/src/main/java/cn/bunny/services/utils/mail/template-propties similarity index 100% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/template-propties rename to service/src/main/java/cn/bunny/services/utils/mail/template-propties diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioProperties.java b/service/src/main/java/cn/bunny/services/utils/minio/MinioProperties.java similarity index 95% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioProperties.java rename to service/src/main/java/cn/bunny/services/utils/minio/MinioProperties.java index 4b64b12..4ba6d6e 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioProperties.java +++ b/service/src/main/java/cn/bunny/services/utils/minio/MinioProperties.java @@ -1,4 +1,4 @@ -package cn.bunny.common.service.utils.minio; +package cn.bunny.services.utils.minio; import io.minio.MinioClient; import lombok.Data; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioUtil.java b/service/src/main/java/cn/bunny/services/utils/minio/MinioUtil.java similarity index 98% rename from common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioUtil.java rename to service/src/main/java/cn/bunny/services/utils/minio/MinioUtil.java index 1e0a3ea..a91868f 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/minio/MinioUtil.java @@ -1,9 +1,9 @@ -package cn.bunny.common.service.utils.minio; +package cn.bunny.services.utils.minio; -import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.constant.MinioConstant; import cn.bunny.dao.model.file.MinioFilePath; import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.services.exception.AuthCustomerException; import io.minio.*; import io.minio.messages.DeleteError; import io.minio.messages.DeleteObject; diff --git a/service/src/main/resources/application-dev.yml b/service/src/main/resources/application-dev.yml index edd1f87..b93eaf6 100644 --- a/service/src/main/resources/application-dev.yml +++ b/service/src/main/resources/application-dev.yml @@ -9,14 +9,13 @@ logging: root: info pattern: dateformat: HH:mm:ss:SSS -# file: -# path: "logs/${spring.application.name}" -# name: "logs/${spring.application.name}" + file: + path: "logs/${spring.application.name}" + name: "logs/${spring.application.name}" -mybatis-plus: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 bunny: master: diff --git a/service/src/main/resources/banner.txt b/service/src/main/resources/banner.txt index b905910..f8a20fa 100644 --- a/service/src/main/resources/banner.txt +++ b/service/src/main/resources/banner.txt @@ -5,6 +5,6 @@ |_.__/ \__,_|_| |_|_| |_|\__, | _/ |\__,_| \_/ \__,_| |___/ |__/ -${spring-boot.formatted-version} -${application.title} +Service Name${spring.application.name} SpringBoot Version: ${spring-boot.version}${spring-boot.formatted-version} +SpringActive：${spring.profiles.active} diff --git a/common/service-utils/src/main/resources/ipdb/ip2region.xdb b/service/src/main/resources/ipdb/ip2region.xdb similarity index 100% rename from common/service-utils/src/main/resources/ipdb/ip2region.xdb rename to service/src/main/resources/ipdb/ip2region.xdb diff --git a/service/src/main/resources/mapper/RoleMapper.xml b/service/src/main/resources/mapper/RoleMapper.xml index 63e3e45..15e172e 100644 --- a/service/src/main/resources/mapper/RoleMapper.xml +++ b/service/src/main/resources/mapper/RoleMapper.xml @@ -16,7 +16,8 @@ - id, create_time, update_time, create_user, update_user, is_deleted, role_code, description + id + , create_time, update_time, create_user, update_user, is_deleted, role_code, description