diff --git a/pom.xml b/pom.xml index e132d63c0e..eec6216766 100644 --- a/pom.xml +++ b/pom.xml @@ -11,11 +11,6 @@ yudao-dependencies yudao-framework yudao-admin-server - yudao-spring-boot-starter-job - yudao-spring-boot-starter-config - yudao-spring-boot-starter-test - yudao-spring-boot-starter-biz-sms - yudao-spring-boot-starter-excel ${artifactId} diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 71e0667567..15fc831322 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -22,6 +22,14 @@ cn.iocoder.boot yudao-spring-boot-starter-biz-operatelog + + cn.iocoder.boot + yudao-spring-boot-starter-biz-dict + + + cn.iocoder.boot + yudao-spring-boot-starter-biz-sms + @@ -40,6 +48,29 @@ yudao-spring-boot-starter-mybatis + + cn.iocoder.boot + yudao-spring-boot-starter-redis + + + + + cn.iocoder.boot + yudao-spring-boot-starter-config + + + + + cn.iocoder.boot + yudao-spring-boot-starter-job + + + + + cn.iocoder.boot + yudao-spring-boot-starter-protection + + cn.iocoder.boot @@ -59,6 +90,11 @@ + + cn.iocoder.boot + yudao-spring-boot-starter-excel + + org.apache.velocity velocity-engine-core diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 9424ddebcc..9363279f61 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -11,7 +11,6 @@ pom yudao-common - yudao-framework-all yudao-spring-boot-starter-mybatis yudao-spring-boot-starter-redis yudao-spring-boot-starter-web diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml index 24a8133ae5..ee8b9b6bcd 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml @@ -35,6 +35,12 @@ + + com.google.guava + guava + true + + com.fasterxml.jackson.core jackson-databind diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java index cfef1694da..ddbd4469a6 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-sms/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.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.framework.common.core.KeyValue; import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java index 899abab0f5..079bb53b4f 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-sms/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.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.framework.common.core.KeyValue; import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; diff --git a/yudao-framework/yudao-spring-boot-starter-config/pom.xml b/yudao-framework/yudao-spring-boot-starter-config/pom.xml index 54dca3a99f..982e3e9922 100644 --- a/yudao-framework/yudao-spring-boot-starter-config/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-config/pom.xml @@ -16,6 +16,11 @@ https://github.com/YunaiV/ruoyi-vue-pro + + cn.iocoder.boot + yudao-common + + org.springframework.boot diff --git a/yudao-framework/yudao-spring-boot-starter-excel/pom.xml b/yudao-framework/yudao-spring-boot-starter-excel/pom.xml index 14eaa5112b..da4ff97a6f 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-excel/pom.xml @@ -16,7 +16,25 @@ https://github.com/YunaiV/ruoyi-vue-pro + + cn.iocoder.boot + yudao-common + + + + + cn.iocoder.boot + yudao-spring-boot-starter-biz-dict + true + + + + org.springframework + spring-web + provided + + jakarta.servlet jakarta.servlet-api diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java index 431d1d040e..6915097373 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java +++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.framework.excel.core.convert; - import cn.hutool.core.convert.Convert; import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.yudao.framework.dict.core.util.DictUtils; diff --git a/yudao-framework/yudao-spring-boot-starter-job/pom.xml b/yudao-framework/yudao-spring-boot-starter-job/pom.xml index 0fe41ea698..f54794731e 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-job/pom.xml @@ -16,11 +16,22 @@ https://github.com/YunaiV/ruoyi-vue-pro + + cn.iocoder.boot + yudao-common + + org.springframework.boot spring-boot-starter-quartz + + + + jakarta.validation + jakarta.validation-api + diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java b/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java index b3aa5eddb6..a3dc8bc639 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java +++ b/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java @@ -15,8 +15,8 @@ import org.springframework.scheduling.quartz.QuartzJobBean; import javax.annotation.Resource; import java.util.Date; +import static cn.hutool.core.exceptions.ExceptionUtil.getRootCauseMessage; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.diff; -import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage; /** * 基础 Job 调用者,负责调用 {@link JobHandler#execute(String)} 执行任务 diff --git a/yudao-framework/yudao-spring-boot-starter-test/pom.xml b/yudao-framework/yudao-spring-boot-starter-test/pom.xml index fccc9df36c..9500403d91 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-test/pom.xml @@ -15,8 +15,12 @@ 测试组件,用于单元测试、集成测试 https://github.com/YunaiV/ruoyi-vue-pro - + + cn.iocoder.boot + yudao-common + + org.springframework.boot