diff --git a/pom.xml b/pom.xml index b42ac1b..51c2aaf 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ xiaoyi-auth xiaoyi-framework + xiaoyi-gateway diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplication.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/XiaoyiAuthApplication.java similarity index 91% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplication.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/XiaoyiAuthApplication.java index 17a37c1..d044e64 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplication.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/XiaoyiAuthApplication.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth; +package top.crushtj.xiaoyi.auth; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/AlarmConfig.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/AlarmConfig.java similarity index 82% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/AlarmConfig.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/AlarmConfig.java index bca2060..4f7eda0 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/AlarmConfig.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/AlarmConfig.java @@ -1,13 +1,13 @@ -package top.crushtj.xiaoyishu.auth.alarm; +package top.crushtj.xiaoyi.auth.alarm; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import top.crushtj.xiaoyishu.auth.alarm.impl.MailAlarmHelper; -import top.crushtj.xiaoyishu.auth.alarm.impl.SmsAlarmHelper; -import top.crushtj.xiaoyishu.auth.constant.XiaoyiAuthConstants; +import top.crushtj.xiaoyi.auth.alarm.impl.MailAlarmHelper; +import top.crushtj.xiaoyi.auth.alarm.impl.SmsAlarmHelper; +import top.crushtj.xiaoyi.auth.constant.XiaoyiAuthConstants; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/AlarmInterface.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/AlarmInterface.java similarity index 87% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/AlarmInterface.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/AlarmInterface.java index 463dcbe..679dbb3 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/AlarmInterface.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/AlarmInterface.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.alarm; +package top.crushtj.xiaoyi.auth.alarm; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/impl/MailAlarmHelper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/impl/MailAlarmHelper.java similarity index 83% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/impl/MailAlarmHelper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/impl/MailAlarmHelper.java index 6494bf7..92bd1e7 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/impl/MailAlarmHelper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/impl/MailAlarmHelper.java @@ -1,7 +1,7 @@ -package top.crushtj.xiaoyishu.auth.alarm.impl; +package top.crushtj.xiaoyi.auth.alarm.impl; import lombok.extern.slf4j.Slf4j; -import top.crushtj.xiaoyishu.auth.alarm.AlarmInterface; +import top.crushtj.xiaoyi.auth.alarm.AlarmInterface; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/impl/SmsAlarmHelper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/impl/SmsAlarmHelper.java similarity index 82% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/impl/SmsAlarmHelper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/impl/SmsAlarmHelper.java index 43609b8..72106fb 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/alarm/impl/SmsAlarmHelper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/alarm/impl/SmsAlarmHelper.java @@ -1,7 +1,7 @@ -package top.crushtj.xiaoyishu.auth.alarm.impl; +package top.crushtj.xiaoyi.auth.alarm.impl; import lombok.extern.slf4j.Slf4j; -import top.crushtj.xiaoyishu.auth.alarm.AlarmInterface; +import top.crushtj.xiaoyi.auth.alarm.AlarmInterface; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/MybatisPlusConfig.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/MybatisPlusConfig.java similarity index 95% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/MybatisPlusConfig.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/MybatisPlusConfig.java index 5567c89..9b42dd1 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/MybatisPlusConfig.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.config; +package top.crushtj.xiaoyi.auth.config; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/RedisTemplateConfig.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/RedisTemplateConfig.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/RedisTemplateConfig.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/RedisTemplateConfig.java index 3577db6..18116dc 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/RedisTemplateConfig.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/RedisTemplateConfig.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.config; +package top.crushtj.xiaoyi.auth.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/ThreadPoolConfig.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/ThreadPoolConfig.java similarity index 93% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/ThreadPoolConfig.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/ThreadPoolConfig.java index 8d5252f..c27f0b8 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/ThreadPoolConfig.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/config/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.config; +package top.crushtj.xiaoyi.auth.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.Executor; import java.util.concurrent.ThreadPoolExecutor; -import static top.crushtj.xiaoyishu.auth.constant.ConfigConstants.*; +import static top.crushtj.xiaoyi.auth.constant.ConfigConstants.*; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/ConfigConstants.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/ConfigConstants.java similarity index 93% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/ConfigConstants.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/ConfigConstants.java index 32e644e..36b929b 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/ConfigConstants.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/ConfigConstants.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.constant; +package top.crushtj.xiaoyi.auth.constant; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RedisKeyConstants.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/RedisKeyConstants.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RedisKeyConstants.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/RedisKeyConstants.java index 62f034f..0e2d5fc 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RedisKeyConstants.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/RedisKeyConstants.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.constant; +package top.crushtj.xiaoyi.auth.constant; /** * diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RoleConstants.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/RoleConstants.java similarity index 85% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RoleConstants.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/RoleConstants.java index 2ba624b..1e04c63 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RoleConstants.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/RoleConstants.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.constant; +package top.crushtj.xiaoyi.auth.constant; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/XiaoyiAuthConstants.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/XiaoyiAuthConstants.java similarity index 90% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/XiaoyiAuthConstants.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/XiaoyiAuthConstants.java index b48dc5d..1cd8278 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/XiaoyiAuthConstants.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/constant/XiaoyiAuthConstants.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.constant; +package top.crushtj.xiaoyi.auth.constant; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/TestController.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/TestController.java similarity index 88% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/TestController.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/TestController.java index 75c9831..d3ab9ee 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/TestController.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/TestController.java @@ -1,11 +1,11 @@ -package top.crushtj.xiaoyishu.auth.controller; +package top.crushtj.xiaoyi.auth.controller; import com.alibaba.nacos.api.config.annotation.NacosValue; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import top.crushtj.xiaoyishu.auth.alarm.AlarmInterface; +import top.crushtj.xiaoyi.auth.alarm.AlarmInterface; @Slf4j @RestController diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/UserController.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/UserController.java similarity index 86% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/UserController.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/UserController.java index ab73e5e..c641092 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/UserController.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/UserController.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.controller; +package top.crushtj.xiaoyi.auth.controller; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import top.crushtj.framework.biz.operationlog.aspect.ApiOperationLog; import top.crushtj.framework.common.response.Response; -import top.crushtj.xiaoyishu.auth.model.vo.user.UserLoginReqVO; -import top.crushtj.xiaoyishu.auth.service.UserService; +import top.crushtj.xiaoyi.auth.model.vo.user.UserLoginReqVO; +import top.crushtj.xiaoyi.auth.service.UserService; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/VerificationCodeController.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/VerificationCodeController.java similarity index 83% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/VerificationCodeController.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/VerificationCodeController.java index 8f4eaaf..ad479ad 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/VerificationCodeController.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/controller/VerificationCodeController.java @@ -1,9 +1,9 @@ -package top.crushtj.xiaoyishu.auth.controller; +package top.crushtj.xiaoyi.auth.controller; import top.crushtj.framework.biz.operationlog.aspect.ApiOperationLog; import top.crushtj.framework.common.response.Response; -import top.crushtj.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; -import top.crushtj.xiaoyishu.auth.service.VerificationCodeService; +import top.crushtj.xiaoyi.auth.model.vo.verificationcode.SendVerificationCodeReqVO; +import top.crushtj.xiaoyi.auth.service.VerificationCodeService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/PermissionEntity.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/PermissionEntity.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/PermissionEntity.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/PermissionEntity.java index 30d3026..654d756 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/PermissionEntity.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/PermissionEntity.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.domain.entity; +package top.crushtj.xiaoyi.auth.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/RoleEntity.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/RoleEntity.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/RoleEntity.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/RoleEntity.java index f677ecd..9b37e08 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/RoleEntity.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/RoleEntity.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.domain.entity; +package top.crushtj.xiaoyi.auth.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/RolePermissionRelEntity.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/RolePermissionRelEntity.java similarity index 96% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/RolePermissionRelEntity.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/RolePermissionRelEntity.java index ff57fab..e340653 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/RolePermissionRelEntity.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/RolePermissionRelEntity.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.domain.entity; +package top.crushtj.xiaoyi.auth.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserEntity.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/UserEntity.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserEntity.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/UserEntity.java index 32a050f..ce24c51 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserEntity.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/UserEntity.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.domain.entity; +package top.crushtj.xiaoyi.auth.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserRoleRelEntity.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/UserRoleRelEntity.java similarity index 96% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserRoleRelEntity.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/UserRoleRelEntity.java index d69fb4d..cc6d6a9 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserRoleRelEntity.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/entity/UserRoleRelEntity.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.domain.entity; +package top.crushtj.xiaoyi.auth.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/PermissionMapper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/PermissionMapper.java similarity index 80% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/PermissionMapper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/PermissionMapper.java index ff05057..30978bf 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/PermissionMapper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/PermissionMapper.java @@ -1,7 +1,7 @@ -package top.crushtj.xiaoyishu.auth.domain.mappers; +package top.crushtj.xiaoyi.auth.domain.mappers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import top.crushtj.xiaoyishu.auth.domain.entity.PermissionEntity; +import top.crushtj.xiaoyi.auth.domain.entity.PermissionEntity; import java.util.List; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/RoleMapper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/RoleMapper.java similarity index 79% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/RoleMapper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/RoleMapper.java index d4da61d..bef5362 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/RoleMapper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/RoleMapper.java @@ -1,7 +1,7 @@ -package top.crushtj.xiaoyishu.auth.domain.mappers; +package top.crushtj.xiaoyi.auth.domain.mappers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import top.crushtj.xiaoyishu.auth.domain.entity.RoleEntity; +import top.crushtj.xiaoyi.auth.domain.entity.RoleEntity; import java.util.List; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/RolePermissionRelMapper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/RolePermissionRelMapper.java similarity index 83% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/RolePermissionRelMapper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/RolePermissionRelMapper.java index 52fadd0..8b54e36 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/RolePermissionRelMapper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/RolePermissionRelMapper.java @@ -1,7 +1,7 @@ -package top.crushtj.xiaoyishu.auth.domain.mappers; +package top.crushtj.xiaoyi.auth.domain.mappers; import org.apache.ibatis.annotations.Param; -import top.crushtj.xiaoyishu.auth.domain.entity.RolePermissionRelEntity; +import top.crushtj.xiaoyi.auth.domain.entity.RolePermissionRelEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserMapper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/UserMapper.java similarity index 81% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserMapper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/UserMapper.java index ccf3b2a..cfc43ee 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserMapper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/UserMapper.java @@ -1,7 +1,7 @@ -package top.crushtj.xiaoyishu.auth.domain.mappers; +package top.crushtj.xiaoyi.auth.domain.mappers; import org.apache.ibatis.annotations.Param; -import top.crushtj.xiaoyishu.auth.domain.entity.UserEntity; +import top.crushtj.xiaoyi.auth.domain.entity.UserEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserRoleRelMapper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/UserRoleRelMapper.java similarity index 72% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserRoleRelMapper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/UserRoleRelMapper.java index 08acaff..d336bcf 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserRoleRelMapper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappers/UserRoleRelMapper.java @@ -1,6 +1,6 @@ -package top.crushtj.xiaoyishu.auth.domain.mappers; +package top.crushtj.xiaoyi.auth.domain.mappers; -import top.crushtj.xiaoyishu.auth.domain.entity.UserRoleRelEntity; +import top.crushtj.xiaoyi.auth.domain.entity.UserRoleRelEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/PermissionMapping.xml b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/PermissionMapping.xml similarity index 85% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/PermissionMapping.xml rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/PermissionMapping.xml index 455e659..d5d27d2 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/PermissionMapping.xml +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/PermissionMapping.xml @@ -1,8 +1,8 @@ - + - + @@ -16,7 +16,7 @@ - SELECT id, name, permission_key FROM t_permission p WHERE p.status = 1 diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/RoleMapping.xml b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/RoleMapping.xml similarity index 83% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/RoleMapping.xml rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/RoleMapping.xml index b74e891..da0b4c9 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/RoleMapping.xml +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/RoleMapping.xml @@ -1,8 +1,8 @@ - + - + @@ -14,7 +14,7 @@ - SELECT id, role_name, role_key FROM t_role WHERE status = 1 diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/RolePermissionRelMapping.xml b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/RolePermissionRelMapping.xml similarity index 76% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/RolePermissionRelMapping.xml rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/RolePermissionRelMapping.xml index b043053..c5af312 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/RolePermissionRelMapping.xml +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/RolePermissionRelMapping.xml @@ -1,8 +1,8 @@ - + - + @@ -10,7 +10,7 @@ - SELECT role_id, permission_id FROM t_role_permission_rel diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserMapping.xml b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/UserMapping.xml similarity index 83% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserMapping.xml rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/UserMapping.xml index cbea3bf..2d2ba0d 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserMapping.xml +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/UserMapping.xml @@ -1,8 +1,8 @@ - + - + @@ -18,7 +18,7 @@ - SELECT id, password, xiaoyishu_id FROM t_user WHERE phone = #{phone} diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserRoleRelMapping.xml b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/UserRoleRelMapping.xml similarity index 77% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserRoleRelMapping.xml rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/UserRoleRelMapping.xml index 1b2503a..83a45a8 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserRoleRelMapping.xml +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/domain/mappings/UserRoleRelMapping.xml @@ -1,8 +1,8 @@ - + - + diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/LoginTypeEnum.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/enums/LoginTypeEnum.java similarity index 94% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/LoginTypeEnum.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/enums/LoginTypeEnum.java index a38dfaa..d540d86 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/LoginTypeEnum.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/enums/LoginTypeEnum.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.enums; +package top.crushtj.xiaoyi.auth.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/ResponseCodeEnum.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/enums/ResponseCodeEnum.java similarity index 95% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/ResponseCodeEnum.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/enums/ResponseCodeEnum.java index 99e8661..80fb40d 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/ResponseCodeEnum.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/enums/ResponseCodeEnum.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.enums; +package top.crushtj.xiaoyi.auth.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/exception/GlobalExceptionHandler.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/exception/GlobalExceptionHandler.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/exception/GlobalExceptionHandler.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/exception/GlobalExceptionHandler.java index 9120d6c..daef26a 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/exception/GlobalExceptionHandler.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.exception; +package top.crushtj.xiaoyi.auth.exception; import java.util.Optional; @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import top.crushtj.framework.common.exception.BizException; import top.crushtj.framework.common.response.Response; -import top.crushtj.xiaoyishu.auth.enums.ResponseCodeEnum; +import top.crushtj.xiaoyi.auth.enums.ResponseCodeEnum; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/user/UserLoginReqVO.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/model/vo/user/UserLoginReqVO.java similarity index 95% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/user/UserLoginReqVO.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/model/vo/user/UserLoginReqVO.java index 5471da7..830378e 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/user/UserLoginReqVO.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/model/vo/user/UserLoginReqVO.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.model.vo.user; +package top.crushtj.xiaoyi.auth.model.vo.user; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java similarity index 90% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java index db3e21d..df90d7d 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.model.vo.verificationcode; +package top.crushtj.xiaoyi.auth.model.vo.verificationcode; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/runner/PushRolePermissions2RedisRunner.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/runner/PushRolePermissions2RedisRunner.java similarity index 90% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/runner/PushRolePermissions2RedisRunner.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/runner/PushRolePermissions2RedisRunner.java index eaab601..1a3f8b6 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/runner/PushRolePermissions2RedisRunner.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/runner/PushRolePermissions2RedisRunner.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.runner; +package top.crushtj.xiaoyi.auth.runner; import cn.hutool.core.collection.CollUtil; import com.google.common.collect.Lists; @@ -9,13 +9,13 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import top.crushtj.framework.common.utils.JsonUtils; -import top.crushtj.xiaoyishu.auth.constant.RedisKeyConstants; -import top.crushtj.xiaoyishu.auth.domain.entity.PermissionEntity; -import top.crushtj.xiaoyishu.auth.domain.entity.RoleEntity; -import top.crushtj.xiaoyishu.auth.domain.entity.RolePermissionRelEntity; -import top.crushtj.xiaoyishu.auth.domain.mappers.PermissionMapper; -import top.crushtj.xiaoyishu.auth.domain.mappers.RoleMapper; -import top.crushtj.xiaoyishu.auth.domain.mappers.RolePermissionRelMapper; +import top.crushtj.xiaoyi.auth.constant.RedisKeyConstants; +import top.crushtj.xiaoyi.auth.domain.entity.PermissionEntity; +import top.crushtj.xiaoyi.auth.domain.entity.RoleEntity; +import top.crushtj.xiaoyi.auth.domain.entity.RolePermissionRelEntity; +import top.crushtj.xiaoyi.auth.domain.mappers.PermissionMapper; +import top.crushtj.xiaoyi.auth.domain.mappers.RoleMapper; +import top.crushtj.xiaoyi.auth.domain.mappers.RolePermissionRelMapper; import java.util.HashMap; import java.util.List; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/runner/cache/CacheLoader.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/runner/cache/CacheLoader.java similarity index 79% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/runner/cache/CacheLoader.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/runner/cache/CacheLoader.java index 2b2658b..0c2d86b 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/runner/cache/CacheLoader.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/runner/cache/CacheLoader.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.runner.cache; +package top.crushtj.xiaoyi.auth.runner.cache; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.PostConstruct; @@ -6,11 +6,11 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; -import top.crushtj.xiaoyishu.auth.domain.entity.UserEntity; -import top.crushtj.xiaoyishu.auth.domain.mappers.UserMapper; +import top.crushtj.xiaoyi.auth.domain.entity.UserEntity; +import top.crushtj.xiaoyi.auth.domain.mappers.UserMapper; -import static top.crushtj.xiaoyishu.auth.constant.RedisKeyConstants.XIAOYI_ID_GENERATOR_KEY; -import static top.crushtj.xiaoyishu.auth.constant.XiaoyiAuthConstants.XIAOYI_ID_INITIAL_VALUE; +import static top.crushtj.xiaoyi.auth.constant.RedisKeyConstants.XIAOYI_ID_GENERATOR_KEY; +import static top.crushtj.xiaoyi.auth.constant.XiaoyiAuthConstants.XIAOYI_ID_INITIAL_VALUE; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/UserService.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/UserService.java similarity index 75% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/UserService.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/UserService.java index c1041ea..54d382f 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/UserService.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/UserService.java @@ -1,9 +1,9 @@ -package top.crushtj.xiaoyishu.auth.service; +package top.crushtj.xiaoyi.auth.service; import com.baomidou.mybatisplus.extension.service.IService; import top.crushtj.framework.common.response.Response; -import top.crushtj.xiaoyishu.auth.domain.entity.UserEntity; -import top.crushtj.xiaoyishu.auth.model.vo.user.UserLoginReqVO; +import top.crushtj.xiaoyi.auth.domain.entity.UserEntity; +import top.crushtj.xiaoyi.auth.model.vo.user.UserLoginReqVO; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/VerificationCodeService.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/VerificationCodeService.java similarity index 77% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/VerificationCodeService.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/VerificationCodeService.java index 8855496..fef20f0 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/VerificationCodeService.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/VerificationCodeService.java @@ -1,7 +1,7 @@ -package top.crushtj.xiaoyishu.auth.service; +package top.crushtj.xiaoyi.auth.service; import top.crushtj.framework.common.response.Response; -import top.crushtj.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; +import top.crushtj.xiaoyi.auth.model.vo.verificationcode.SendVerificationCodeReqVO; /** * diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/UserServiceImpl.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/impl/UserServiceImpl.java similarity index 87% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/UserServiceImpl.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/impl/UserServiceImpl.java index 381309d..0f811df 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/UserServiceImpl.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.service.impl; +package top.crushtj.xiaoyi.auth.service.impl; import cn.dev33.satoken.stp.SaTokenInfo; import cn.dev33.satoken.stp.StpUtil; @@ -18,25 +18,25 @@ import top.crushtj.framework.common.response.Response; import top.crushtj.framework.common.utils.IdGenerator; import top.crushtj.framework.common.utils.JsonUtils; import top.crushtj.framework.common.utils.MaskUtils; -import top.crushtj.xiaoyishu.auth.constant.RedisKeyConstants; -import top.crushtj.xiaoyishu.auth.domain.entity.UserEntity; -import top.crushtj.xiaoyishu.auth.domain.entity.UserRoleRelEntity; -import top.crushtj.xiaoyishu.auth.domain.mappers.UserMapper; -import top.crushtj.xiaoyishu.auth.domain.mappers.UserRoleRelMapper; -import top.crushtj.xiaoyishu.auth.enums.LoginTypeEnum; -import top.crushtj.xiaoyishu.auth.enums.ResponseCodeEnum; -import top.crushtj.xiaoyishu.auth.model.vo.user.UserLoginReqVO; -import top.crushtj.xiaoyishu.auth.service.UserService; +import top.crushtj.xiaoyi.auth.constant.RedisKeyConstants; +import top.crushtj.xiaoyi.auth.domain.entity.UserEntity; +import top.crushtj.xiaoyi.auth.domain.entity.UserRoleRelEntity; +import top.crushtj.xiaoyi.auth.domain.mappers.UserMapper; +import top.crushtj.xiaoyi.auth.domain.mappers.UserRoleRelMapper; +import top.crushtj.xiaoyi.auth.enums.LoginTypeEnum; +import top.crushtj.xiaoyi.auth.enums.ResponseCodeEnum; +import top.crushtj.xiaoyi.auth.model.vo.user.UserLoginReqVO; +import top.crushtj.xiaoyi.auth.service.UserService; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static top.crushtj.xiaoyishu.auth.constant.RedisKeyConstants.XIAOYI_ID_GENERATOR_KEY; -import static top.crushtj.xiaoyishu.auth.constant.RoleConstants.COMMON_USER_ROLE_ID; -import static top.crushtj.xiaoyishu.auth.constant.XiaoyiAuthConstants.NICK_NAME_PREFIX; -import static top.crushtj.xiaoyishu.auth.constant.XiaoyiAuthConstants.XIAOYI_ID_INITIAL_VALUE; +import static top.crushtj.xiaoyi.auth.constant.RedisKeyConstants.XIAOYI_ID_GENERATOR_KEY; +import static top.crushtj.xiaoyi.auth.constant.RoleConstants.COMMON_USER_ROLE_ID; +import static top.crushtj.xiaoyi.auth.constant.XiaoyiAuthConstants.NICK_NAME_PREFIX; +import static top.crushtj.xiaoyi.auth.constant.XiaoyiAuthConstants.XIAOYI_ID_INITIAL_VALUE; /** * @author ayi diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/impl/VerificationCodeServiceImpl.java similarity index 90% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/impl/VerificationCodeServiceImpl.java index a367da5..aaa12b9 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/service/impl/VerificationCodeServiceImpl.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.service.impl; +package top.crushtj.xiaoyi.auth.service.impl; import cn.hutool.core.util.RandomUtil; import jakarta.annotation.Resource; @@ -9,15 +9,15 @@ import org.springframework.stereotype.Service; import top.crushtj.framework.common.exception.BizException; import top.crushtj.framework.common.response.Response; import top.crushtj.framework.common.utils.MaskUtils; -import top.crushtj.xiaoyishu.auth.constant.RedisKeyConstants; -import top.crushtj.xiaoyishu.auth.enums.ResponseCodeEnum; -import top.crushtj.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; -import top.crushtj.xiaoyishu.auth.service.VerificationCodeService; -import top.crushtj.xiaoyishu.auth.sms.AliyunSmsHelper; +import top.crushtj.xiaoyi.auth.constant.RedisKeyConstants; +import top.crushtj.xiaoyi.auth.enums.ResponseCodeEnum; +import top.crushtj.xiaoyi.auth.model.vo.verificationcode.SendVerificationCodeReqVO; +import top.crushtj.xiaoyi.auth.service.VerificationCodeService; +import top.crushtj.xiaoyi.auth.sms.AliyunSmsHelper; import java.util.concurrent.TimeUnit; -import static top.crushtj.xiaoyishu.auth.constant.RedisKeyConstants.VERIFICATION_CODE_EXPIRE_TIME; +import static top.crushtj.xiaoyi.auth.constant.RedisKeyConstants.VERIFICATION_CODE_EXPIRE_TIME; /** * 验证码服务实现类 diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunAccessKeyProperties.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunAccessKeyProperties.java similarity index 92% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunAccessKeyProperties.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunAccessKeyProperties.java index 13fdcc2..bbbfaf0 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunAccessKeyProperties.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunAccessKeyProperties.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.sms; +package top.crushtj.xiaoyi.auth.sms; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunSmsClientConfig.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunSmsClientConfig.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunSmsClientConfig.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunSmsClientConfig.java index e81a5ab..0c3f2b4 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunSmsClientConfig.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunSmsClientConfig.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.sms; +package top.crushtj.xiaoyi.auth.sms; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunSmsHelper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunSmsHelper.java similarity index 97% rename from xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunSmsHelper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunSmsHelper.java index 41bff0f..22cf985 100644 --- a/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/sms/AliyunSmsHelper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyi/auth/sms/AliyunSmsHelper.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth.sms; +package top.crushtj.xiaoyi.auth.sms; import com.aliyun.dypnsapi20170525.models.SendSmsVerifyCodeResponse; import jakarta.annotation.Resource; diff --git a/xiaoyi-auth/src/main/resources/config/application-dev.yml b/xiaoyi-auth/src/main/resources/config/application-dev.yml index c38711e..e84311e 100644 --- a/xiaoyi-auth/src/main/resources/config/application-dev.yml +++ b/xiaoyi-auth/src/main/resources/config/application-dev.yml @@ -1,7 +1,3 @@ -server: - servlet: - context-path: /xiaoyishu-auth - spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/EncryptTest.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/EncryptTest.java similarity index 99% rename from xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/EncryptTest.java rename to xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/EncryptTest.java index 6a7812d..113c03c 100644 --- a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/EncryptTest.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/EncryptTest.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth; +package top.crushtj.xiaoyi.auth; import com.alibaba.druid.filter.config.ConfigTools; import lombok.SneakyThrows; diff --git a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/RedisTests.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/RedisTests.java similarity index 97% rename from xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/RedisTests.java rename to xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/RedisTests.java index 6898834..908d69a 100644 --- a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/RedisTests.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/RedisTests.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth; +package top.crushtj.xiaoyi.auth; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/ThreadPoolTaskExecutorTests.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/ThreadPoolTaskExecutorTests.java similarity index 96% rename from xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/ThreadPoolTaskExecutorTests.java rename to xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/ThreadPoolTaskExecutorTests.java index 9693c8c..60c2236 100644 --- a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/ThreadPoolTaskExecutorTests.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyi/auth/ThreadPoolTaskExecutorTests.java @@ -1,4 +1,4 @@ -package top.crushtj.xiaoyishu.auth; +package top.crushtj.xiaoyi.auth; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/xiaoyi-gateway/pom.xml b/xiaoyi-gateway/pom.xml new file mode 100644 index 0000000..c016a0f --- /dev/null +++ b/xiaoyi-gateway/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + top.crushtj + xiaoyishu + ${revision} + + + xiaoyi-gateway + jar + + ${project.artifactId} + 网关服务 + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/xiaoyi-gateway/src/main/java/top/crushtj/xiaoyi/gateway/XiaoyiGatewayApplication.java b/xiaoyi-gateway/src/main/java/top/crushtj/xiaoyi/gateway/XiaoyiGatewayApplication.java new file mode 100644 index 0000000..391bbb1 --- /dev/null +++ b/xiaoyi-gateway/src/main/java/top/crushtj/xiaoyi/gateway/XiaoyiGatewayApplication.java @@ -0,0 +1,20 @@ +package top.crushtj.xiaoyi.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author ayi + * @version V1.0 + * @title XiaoyiGatewayApplication + * @date 2026/2/2 16:46 + * @description 网关启动类 + */ + +@SpringBootApplication +public class XiaoyiGatewayApplication { + public static void main(String[] args) { + SpringApplication.run(XiaoyiGatewayApplication.class, args); + } + +} diff --git a/xiaoyi-gateway/src/main/resources/application.yml b/xiaoyi-gateway/src/main/resources/application.yml new file mode 100644 index 0000000..00e03fc --- /dev/null +++ b/xiaoyi-gateway/src/main/resources/application.yml @@ -0,0 +1,12 @@ +server: + port: 8000 # 指定启动端口 +spring: + cloud: + gateway: + routes: + - id: auth + uri: lb://xiaoyishu-auth + predicates: + - Path=/auth/** + filters: + - StripPrefix=1 diff --git a/xiaoyi-gateway/src/main/resources/bootstrap.yml b/xiaoyi-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..8c2c408 --- /dev/null +++ b/xiaoyi-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,12 @@ +spring: + application: + name: xiaoyi-gateway # 应用名称 + profiles: + active: dev + cloud: + nacos: + discovery: + enabled: true # 启用服务发现 + group: DEFAULT_GROUP # 所属组 + namespace: xiaoyishu # 命名空间 + server-addr: 127.0.0.1:8848 # Nacos 服务器地址 diff --git a/xiaoyi-gateway/src/test/java/top/crushtj/xiaoyi/gateway/AppTest.java b/xiaoyi-gateway/src/test/java/top/crushtj/xiaoyi/gateway/AppTest.java new file mode 100644 index 0000000..4eebf72 --- /dev/null +++ b/xiaoyi-gateway/src/test/java/top/crushtj/xiaoyi/gateway/AppTest.java @@ -0,0 +1,38 @@ +package top.crushtj.xiaoyi.gateway; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +}