diff --git a/pom.xml b/pom.xml index e911ac6..c4094b8 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ yudao-admin-server - yudao + ${artifactId} 芋道项目基础脚手架 https://github.com/YunaiV/ruoyi-vue-pro diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index e9a5ed2..23082c6 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -2,12 +2,14 @@ + + cn.iocoder.boot + yudao + ${revision} + 4.0.0 - cn.iocoder.boot yudao-admin-server - ${revision} - jar yudao-admin-server @@ -15,8 +17,6 @@ https://github.com/YunaiV/ruoyi-vue-pro - 1.0.0 - 1.8 ${java.version} ${java.version} @@ -53,7 +53,28 @@ podam test - + + + ${artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + repackage + + + + + + + diff --git a/yudao-admin-server/src/test/resources/logback-spring.xml b/yudao-admin-server/src/test/resources/logback-spring.xml new file mode 100644 index 0000000..daf756b --- /dev/null +++ b/yudao-admin-server/src/test/resources/logback-spring.xml @@ -0,0 +1,4 @@ + + + + diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 227a0ed..4d94b12 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -9,7 +9,7 @@ ${revision} pom - yudao-dependencies + ${artifactId} 基础 bom 文件,管理整个项目的依赖版本 https://github.com/YunaiV/ruoyi-vue-pro diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 9d98919..76d4839 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -10,6 +10,11 @@ 4.0.0 yudao-framework + jar + + ${artifactId} + 基础框架,各种组件的拓展 + https://github.com/YunaiV/ruoyi-vue-pro UTF-8 diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java deleted file mode 100644 index 6e20738..0000000 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 单元测试、集成测试的拓展 - */ -package cn.iocoder.dashboard.framework.test; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java index eb909a8..15d6a52 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.framework.test.core; +package cn.iocoder.dashboard.framework; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java deleted file mode 100644 index 0274647..0000000 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.dashboard.framework; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java index 89c1d59..3f407af 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java index 67db430..42c9871 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java index 0d1232e..d6b412d 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java index 261bc0d..aaf200d 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test;