diff --git a/.vscode/launch.json b/.vscode/launch.json index 085cbd4..6224e9d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "name": "Spring Boot-XiaoyiAuthApplication", "request": "launch", "cwd": "${workspaceFolder}", - "mainClass": "com.jy.xiaoyishu.auth.XiaoyiAuthApplication", + "mainClass": "top.crushtj.xiaoyishu.auth.XiaoyiAuthApplication", "projectName": "xiaoyi-auth", "args": "", "envFile": "${workspaceFolder}/.env" diff --git a/pom.xml b/pom.xml index f515d32..1ae5f43 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.jy + top.crushtj xiaoyishu ${revision} @@ -54,20 +54,20 @@ - com.jy + top.crushtj xiaoyi-common ${revision} - com.jy + top.crushtj xiaoyi-spring-boot-starter-biz-operationlog ${revision} - com.jy + top.crushtj xiaoyi-spring-boot-starter-jackson ${revision} diff --git a/xiaoyi-auth/pom.xml b/xiaoyi-auth/pom.xml index 43776a4..94d3c06 100644 --- a/xiaoyi-auth/pom.xml +++ b/xiaoyi-auth/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.jy + top.crushtj xiaoyishu ${revision} @@ -19,18 +19,18 @@ - com.jy + top.crushtj xiaoyi-common - com.jy + top.crushtj xiaoyi-spring-boot-starter-biz-operationlog - com.jy + top.crushtj xiaoyi-spring-boot-starter-jackson diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/XiaoyiAuthApplication.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplication.java similarity index 91% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/XiaoyiAuthApplication.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplication.java index 962a7f4..17a37c1 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/XiaoyiAuthApplication.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplication.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth; +package top.crushtj.xiaoyishu.auth; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/config/MybatisPlusConfig.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/MybatisPlusConfig.java similarity index 90% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/config/MybatisPlusConfig.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/MybatisPlusConfig.java index 58a9f1c..5567c89 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/config/MybatisPlusConfig.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.config; +package top.crushtj.xiaoyishu.auth.config; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration -@MapperScan("com.jy.**.mappers") +@MapperScan("top.crushtj.**.mappers") public class MybatisPlusConfig { /** * 分页插件 diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/config/RedisTemplateConfig.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/RedisTemplateConfig.java similarity index 97% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/config/RedisTemplateConfig.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/RedisTemplateConfig.java index 121b9ce..3577db6 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/config/RedisTemplateConfig.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/config/RedisTemplateConfig.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.config; +package top.crushtj.xiaoyishu.auth.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/constant/RedisKeyConstants.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RedisKeyConstants.java similarity index 92% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/constant/RedisKeyConstants.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RedisKeyConstants.java index d797d30..c28763b 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/constant/RedisKeyConstants.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/constant/RedisKeyConstants.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.constant; +package top.crushtj.xiaoyishu.auth.constant; /** * diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/controller/TestController.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/TestController.java similarity index 88% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/controller/TestController.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/TestController.java index 0160916..4a87593 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/controller/TestController.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/TestController.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.controller; +package top.crushtj.xiaoyishu.auth.controller; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -6,9 +6,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.jy.framework.biz.operationlog.aspect.ApiOperationLog; -import com.jy.framework.common.response.Response; -import com.jy.xiaoyishu.auth.model.vo.User; +import top.crushtj.framework.biz.operationlog.aspect.ApiOperationLog; +import top.crushtj.framework.common.response.Response; +import top.crushtj.xiaoyishu.auth.model.vo.User; import cn.dev33.satoken.stp.StpUtil; diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/controller/VerificationCodeController.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/VerificationCodeController.java similarity index 72% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/controller/VerificationCodeController.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/VerificationCodeController.java index 16582d5..8f4eaaf 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/controller/VerificationCodeController.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/controller/VerificationCodeController.java @@ -1,9 +1,9 @@ -package com.jy.xiaoyishu.auth.controller; +package top.crushtj.xiaoyishu.auth.controller; -import com.jy.framework.biz.operationlog.aspect.ApiOperationLog; -import com.jy.framework.common.response.Response; -import com.jy.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; -import com.jy.xiaoyishu.auth.service.VerificationCodeService; +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 jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/entity/UserEntity.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserEntity.java similarity index 96% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/entity/UserEntity.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserEntity.java index 0e16376..01eebe8 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/entity/UserEntity.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/entity/UserEntity.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.domain.entity; +package top.crushtj.xiaoyishu.auth.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/mappers/UserMapper.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserMapper.java similarity index 68% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/mappers/UserMapper.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserMapper.java index 2a176a5..25058f9 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/mappers/UserMapper.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappers/UserMapper.java @@ -1,6 +1,6 @@ -package com.jy.xiaoyishu.auth.domain.mappers; +package top.crushtj.xiaoyishu.auth.domain.mappers; -import com.jy.xiaoyishu.auth.domain.entity.UserEntity; +import top.crushtj.xiaoyishu.auth.domain.entity.UserEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/mappings/UserMapping.xml b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserMapping.xml similarity index 78% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/mappings/UserMapping.xml rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserMapping.xml index fdba095..d4da605 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/domain/mappings/UserMapping.xml +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/domain/mappings/UserMapping.xml @@ -1,8 +1,8 @@ - + - + diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/enums/ResponseCodeEnum.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/ResponseCodeEnum.java similarity index 86% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/enums/ResponseCodeEnum.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/ResponseCodeEnum.java index f462bfb..37fe4b0 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/enums/ResponseCodeEnum.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/enums/ResponseCodeEnum.java @@ -1,10 +1,10 @@ -package com.jy.xiaoyishu.auth.enums; +package top.crushtj.xiaoyishu.auth.enums; import lombok.AllArgsConstructor; import lombok.Getter; import java.lang.String; -import com.jy.framework.common.exception.BaseExceptionInterface; +import top.crushtj.framework.common.exception.BaseExceptionInterface; /** * diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/exception/GlobalExceptionHandler.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/exception/GlobalExceptionHandler.java similarity index 90% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/exception/GlobalExceptionHandler.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/exception/GlobalExceptionHandler.java index aba80d9..8bd6e47 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/exception/GlobalExceptionHandler.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.exception; +package top.crushtj.xiaoyishu.auth.exception; import java.util.Optional; @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; -import com.jy.framework.common.exception.BizException; -import com.jy.framework.common.response.Response; -import com.jy.xiaoyishu.auth.enums.ResponseCodeEnum; +import top.crushtj.framework.common.exception.BizException; +import top.crushtj.framework.common.response.Response; +import top.crushtj.xiaoyishu.auth.enums.ResponseCodeEnum; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -63,7 +63,7 @@ public class GlobalExceptionHandler { StringBuilder sb = new StringBuilder(); // 获取校验不通过的字段，并组合错误信息，格式为： email 邮箱格式不正确, 当前值: '123124qq.com'; - Optional.ofNullable(bindingResult.getFieldErrors()).ifPresent(errors -> { + Optional.of(bindingResult.getFieldErrors()).ifPresent(errors -> { errors.forEach(error -> sb.append(error.getField()).append(" ").append(error.getDefaultMessage()) .append(", 当前值: '").append(error.getRejectedValue()).append("'; ") diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/model/vo/User.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/User.java similarity index 93% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/model/vo/User.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/User.java index 02d92df..32ffa8b 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/model/vo/User.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/User.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.model.vo; +package top.crushtj.xiaoyishu.auth.model.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java similarity index 89% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java index b705cf9..80c727b 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/model/vo/verificationcode/SendVerificationCodeReqVO.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth.model.vo.verificationcode; +package top.crushtj.xiaoyishu.auth.model.vo.verificationcode; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/service/VerificationCodeService.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/VerificationCodeService.java similarity index 68% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/service/VerificationCodeService.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/VerificationCodeService.java index 27446b7..8855496 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/service/VerificationCodeService.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/VerificationCodeService.java @@ -1,7 +1,7 @@ -package com.jy.xiaoyishu.auth.service; +package top.crushtj.xiaoyishu.auth.service; -import com.jy.framework.common.response.Response; -import com.jy.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; +import top.crushtj.framework.common.response.Response; +import top.crushtj.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; /** * diff --git a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java similarity index 76% rename from xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java rename to xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java index 5f53cdc..a08993f 100644 --- a/xiaoyi-auth/src/main/java/com/jy/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java +++ b/xiaoyi-auth/src/main/java/top/crushtj/xiaoyishu/auth/service/impl/VerificationCodeServiceImpl.java @@ -1,16 +1,16 @@ -package com.jy.xiaoyishu.auth.service.impl; +package top.crushtj.xiaoyishu.auth.service.impl; import cn.hutool.core.util.RandomUtil; -import com.jy.framework.common.exception.BizException; -import com.jy.framework.common.response.Response; -import com.jy.xiaoyishu.auth.constant.RedisKeyConstants; -import com.jy.xiaoyishu.auth.enums.ResponseCodeEnum; -import com.jy.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; +import top.crushtj.framework.common.exception.BizException; +import top.crushtj.framework.common.response.Response; +import top.crushtj.xiaoyishu.auth.constant.RedisKeyConstants; +import top.crushtj.xiaoyishu.auth.enums.ResponseCodeEnum; +import top.crushtj.xiaoyishu.auth.model.vo.verificationcode.SendVerificationCodeReqVO; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import com.jy.xiaoyishu.auth.service.VerificationCodeService; +import top.crushtj.xiaoyishu.auth.service.VerificationCodeService; import java.util.concurrent.TimeUnit; diff --git a/xiaoyi-auth/src/main/resources/config/application-dev.yml b/xiaoyi-auth/src/main/resources/config/application-dev.yml index 175eb32..0a3d0bc 100644 --- a/xiaoyi-auth/src/main/resources/config/application-dev.yml +++ b/xiaoyi-auth/src/main/resources/config/application-dev.yml @@ -64,11 +64,11 @@ spring: mybatis-plus: mapper-locations: - classpath*:top/crushtj/**/*.xml # 匹配所有模块中的 Mapper XML 文件 - type-aliases-package: com.jy.xiaoyishu.auth.domain.entity # 实体类包路径 + type-aliases-package: top.crushtj.xiaoyishu.auth.domain.entity # 实体类包路径 configuration: map-underscore-to-camel-case: true # 开启驼峰命名转换 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 日志输出（调试用） logging: level: - com.jy.xiaoyishu.auth.domain.mappers: debug \ No newline at end of file + top.crushtj.xiaoyishu.auth.domain.mappers: debug \ No newline at end of file diff --git a/xiaoyi-auth/src/main/resources/config/application-prod.yml b/xiaoyi-auth/src/main/resources/config/application-prod.yml index e0d4808..d5370ce 100644 --- a/xiaoyi-auth/src/main/resources/config/application-prod.yml +++ b/xiaoyi-auth/src/main/resources/config/application-prod.yml @@ -50,11 +50,11 @@ spring: mybatis-plus: mapper-locations: - classpath*:top/crushtj/**/*.xml # 匹配所有模块中的 Mapper XML 文件 - type-aliases-package: com.jy.xiaoyishu.auth.domain.entity # 实体类包路径 + type-aliases-package: top.crushtj.xiaoyishu.auth.domain.entity # 实体类包路径 configuration: map-underscore-to-camel-case: true # 开启驼峰命名转换 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 日志输出（调试用） logging: level: - com.jy.xiaoyishu.auth.domain.mappers: debug \ No newline at end of file + top.crushtj.xiaoyishu.auth.domain.mappers: debug \ No newline at end of file diff --git a/xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/DruidTest.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/DruidTest.java similarity index 96% rename from xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/DruidTest.java rename to xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/DruidTest.java index 8d3a68f..654f273 100644 --- a/xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/DruidTest.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/DruidTest.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth; +package top.crushtj.xiaoyishu.auth; import com.alibaba.druid.filter.config.ConfigTools; import lombok.SneakyThrows; diff --git a/xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/RedisTests.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/RedisTests.java similarity index 97% rename from xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/RedisTests.java rename to xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/RedisTests.java index f9abc15..6898834 100644 --- a/xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/RedisTests.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/RedisTests.java @@ -1,4 +1,4 @@ -package com.jy.xiaoyishu.auth; +package top.crushtj.xiaoyishu.auth; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/XiaoyiAuthApplicationTests.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplicationTests.java similarity index 88% rename from xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/XiaoyiAuthApplicationTests.java rename to xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplicationTests.java index 51b7293..6b2885b 100644 --- a/xiaoyi-auth/src/test/java/com/jy/xiaoyishu/auth/XiaoyiAuthApplicationTests.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/XiaoyiAuthApplicationTests.java @@ -1,12 +1,12 @@ -package com.jy.xiaoyishu.auth; +package top.crushtj.xiaoyishu.auth; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import com.jy.xiaoyishu.auth.domain.entity.UserEntity; -import com.jy.xiaoyishu.auth.domain.mappers.UserMapper; +import top.crushtj.xiaoyishu.auth.domain.entity.UserEntity; +import top.crushtj.xiaoyishu.auth.domain.mappers.UserMapper; import java.time.LocalDateTime; diff --git a/xiaoyi-framework/pom.xml b/xiaoyi-framework/pom.xml index de69b61..090e066 100644 --- a/xiaoyi-framework/pom.xml +++ b/xiaoyi-framework/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.jy + top.crushtj xiaoyishu ${revision} diff --git a/xiaoyi-framework/xiaoyi-common/pom.xml b/xiaoyi-framework/xiaoyi-common/pom.xml index ed09ea0..d1985e4 100644 --- a/xiaoyi-framework/xiaoyi-common/pom.xml +++ b/xiaoyi-framework/xiaoyi-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.jy + top.crushtj xiaoyi-framework ${revision} diff --git a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/constant/DateConstants.java b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/constant/DateConstants.java similarity index 94% rename from xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/constant/DateConstants.java rename to xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/constant/DateConstants.java index 252db89..39784a1 100644 --- a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/constant/DateConstants.java +++ b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/constant/DateConstants.java @@ -1,4 +1,4 @@ -package com.jy.framework.common.constant; +package top.crushtj.framework.common.constant; import java.time.format.DateTimeFormatter; diff --git a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/exception/BaseExceptionInterface.java b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/exception/BaseExceptionInterface.java similarity index 88% rename from xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/exception/BaseExceptionInterface.java rename to xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/exception/BaseExceptionInterface.java index 81880e1..e237738 100644 --- a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/exception/BaseExceptionInterface.java +++ b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/exception/BaseExceptionInterface.java @@ -1,4 +1,4 @@ -package com.jy.framework.common.exception; +package top.crushtj.framework.common.exception; /** * diff --git a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/exception/BizException.java b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/exception/BizException.java similarity index 93% rename from xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/exception/BizException.java rename to xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/exception/BizException.java index 8c96436..25021b7 100644 --- a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/exception/BizException.java +++ b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/exception/BizException.java @@ -1,4 +1,4 @@ -package com.jy.framework.common.exception; +package top.crushtj.framework.common.exception; import lombok.Getter; import lombok.Setter; diff --git a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/response/Response.java b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/response/Response.java similarity index 94% rename from xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/response/Response.java rename to xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/response/Response.java index 40a9b09..66d6e6a 100644 --- a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/response/Response.java +++ b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/response/Response.java @@ -1,12 +1,12 @@ -package com.jy.framework.common.response; +package top.crushtj.framework.common.response; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; import lombok.Data; -import com.jy.framework.common.exception.BaseExceptionInterface; -import com.jy.framework.common.exception.BizException; +import top.crushtj.framework.common.exception.BaseExceptionInterface; +import top.crushtj.framework.common.exception.BizException; /** * diff --git a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/utils/JsonUtils.java b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/utils/JsonUtils.java similarity index 96% rename from xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/utils/JsonUtils.java rename to xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/utils/JsonUtils.java index 5569b42..7f81b42 100644 --- a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/utils/JsonUtils.java +++ b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.jy.framework.common.utils; +package top.crushtj.framework.common.utils; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/utils/SnowflakeIdGenerator.java b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/utils/SnowflakeIdGenerator.java similarity index 99% rename from xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/utils/SnowflakeIdGenerator.java rename to xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/utils/SnowflakeIdGenerator.java index b9be78b..6717d5f 100644 --- a/xiaoyi-framework/xiaoyi-common/src/main/java/com/jy/framework/common/utils/SnowflakeIdGenerator.java +++ b/xiaoyi-framework/xiaoyi-common/src/main/java/top/crushtj/framework/common/utils/SnowflakeIdGenerator.java @@ -1,4 +1,4 @@ -package com.jy.framework.common.utils; +package top.crushtj.framework.common.utils; import java.lang.management.ManagementFactory; import java.net.InetAddress; diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/pom.xml b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/pom.xml index 922d2e9..37c8f3e 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/pom.xml +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.jy + top.crushtj xiaoyi-framework ${revision} @@ -17,7 +17,7 @@ - com.jy + top.crushtj xiaoyi-common diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/ApiOperationLogAspect.java b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/ApiOperationLogAspect.java similarity index 92% rename from xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/ApiOperationLogAspect.java rename to xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/ApiOperationLogAspect.java index c2bc406..e28032a 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/ApiOperationLogAspect.java +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/ApiOperationLogAspect.java @@ -1,4 +1,4 @@ -package com.jy.framework.biz.operationlog; +package top.crushtj.framework.biz.operationlog; import java.lang.reflect.Method; import java.util.Arrays; @@ -12,8 +12,8 @@ import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import lombok.extern.slf4j.Slf4j; -import com.jy.framework.biz.operationlog.aspect.ApiOperationLog; -import com.jy.framework.common.utils.JsonUtils; +import top.crushtj.framework.biz.operationlog.aspect.ApiOperationLog; +import top.crushtj.framework.common.utils.JsonUtils; /** * @@ -27,7 +27,7 @@ import com.jy.framework.common.utils.JsonUtils; @Aspect public class ApiOperationLogAspect { /** 以自定义 @ApiOperationLog 注解为切点，凡是添加 @ApiOperationLog 的方法，都会执行环绕中的代码 */ - @Pointcut("@annotation(com.jy.framework.biz.operationlog.aspect.ApiOperationLog)") + @Pointcut("@annotation(top.crushtj.framework.biz.operationlog.aspect.ApiOperationLog)") public void apiOperationLog() { } diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/aspect/ApiOperationLog.java b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/aspect/ApiOperationLog.java similarity index 91% rename from xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/aspect/ApiOperationLog.java rename to xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/aspect/ApiOperationLog.java index 109e6c5..421b6f0 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/aspect/ApiOperationLog.java +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/aspect/ApiOperationLog.java @@ -1,4 +1,4 @@ -package com.jy.framework.biz.operationlog.aspect; +package top.crushtj.framework.biz.operationlog.aspect; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/config/ApiOperationLogAutoConfiguration.java b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/config/ApiOperationLogAutoConfiguration.java similarity index 78% rename from xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/config/ApiOperationLogAutoConfiguration.java rename to xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/config/ApiOperationLogAutoConfiguration.java index 49eb229..f9d28e1 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/com/jy/framework/biz/operationlog/config/ApiOperationLogAutoConfiguration.java +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/java/top/crushtj/framework/biz/operationlog/config/ApiOperationLogAutoConfiguration.java @@ -1,9 +1,9 @@ -package com.jy.framework.biz.operationlog.config; +package top.crushtj.framework.biz.operationlog.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import com.jy.framework.biz.operationlog.ApiOperationLogAspect; +import top.crushtj.framework.biz.operationlog.ApiOperationLogAspect; /** * diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4fed188..c15c1d4 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-biz-operationlog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.jy.framework.biz.operationlog.config.ApiOperationLogAutoConfiguration \ No newline at end of file +top.crushtj.framework.biz.operationlog.config.ApiOperationLogAutoConfiguration \ No newline at end of file diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/pom.xml b/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/pom.xml index 6be62e2..d0b9286 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/pom.xml +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.jy + top.crushtj xiaoyi-framework ${revision} @@ -16,7 +16,7 @@ - com.jy + top.crushtj xiaoyi-common diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/java/com/jy/framework/jackson/JacksonAutoConfiguration.java b/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/java/top/crushtj/framework/jackson/JacksonAutoConfiguration.java similarity index 91% rename from xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/java/com/jy/framework/jackson/JacksonAutoConfiguration.java rename to xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/java/top/crushtj/framework/jackson/JacksonAutoConfiguration.java index b92c433..6132c18 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/java/com/jy/framework/jackson/JacksonAutoConfiguration.java +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/java/top/crushtj/framework/jackson/JacksonAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.jy.framework.jackson; +package top.crushtj.framework.jackson; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -13,9 +13,10 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.YearMonthSerializer; import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.context.annotation.Bean; -import com.jy.framework.common.constant.DateConstants; -import com.jy.framework.common.utils.JsonUtils; +import top.crushtj.framework.common.constant.DateConstants; +import top.crushtj.framework.common.utils.JsonUtils; import java.time.LocalDate; import java.time.LocalDateTime; @@ -32,6 +33,7 @@ import java.util.TimeZone; */ @AutoConfiguration +@AutoConfigureBefore(org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration.class) public class JacksonAutoConfiguration { @Bean diff --git a/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 927eb93..28baee9 100644 --- a/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/xiaoyi-framework/xiaoyi-spring-boot-starter-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.jy.framework.jackson.JacksonAutoConfiguration \ No newline at end of file +top.crushtj.framework.jackson.JacksonAutoConfiguration \ No newline at end of file