From ce3b367f38e69a43db6049a3e0ec617ea63c9904 Mon Sep 17 00:00:00 2001 From: noear Date: Tue, 4 Jun 2024 11:54:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91solon?= =?UTF-8?q?=20=E5=8D=87=E4=B8=BA=202.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- .../dev/modular/job/service/impl/DevJobServiceImpl.java | 2 +- snowy-web-app/src/main/resources/app.yml | 4 ++-- snowy-web-app/src/test/java/apis/ApiDevTest.java | 3 --- snowy-web-app/src/test/java/apis/WelcomeTest.java | 5 +---- snowy-web-app/src/test/java/vip/xiaonuo/MainTest.java | 6 +----- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 5d7bbec..e6beea3 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.noear solon-parent - 2.6.0 + 2.8.1 @@ -56,7 +56,7 @@ 4.13.2 1.16.5 2.0.9 - 1.3.7 + 1.3.14 1.18.22 8.5.2 11.2.1.jre8 @@ -75,7 +75,7 @@ 2.5.1 42.2.25 3.21.12 - 1.35.0.RC + 1.38.0 0.3.2 2.0 5.6.68 diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java index ca83336..13d0962 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java @@ -24,10 +24,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.solon.plugins.pagination.Page; import com.baomidou.mybatisplus.solon.service.impl.ServiceImpl; +import org.noear.java_cron.CronExpression; import org.noear.solon.Solon; import org.noear.solon.annotation.Component; import org.noear.solon.data.annotation.Tran; -import org.noear.solon.scheduling.simple.cron.CronExpression; import vip.xiaonuo.common.enums.CommonSortOrderEnum; import vip.xiaonuo.common.exception.CommonException; import vip.xiaonuo.common.page.CommonPageRequest; diff --git a/snowy-web-app/src/main/resources/app.yml b/snowy-web-app/src/main/resources/app.yml index d6b72c8..a7c3db2 100644 --- a/snowy-web-app/src/main/resources/app.yml +++ b/snowy-web-app/src/main/resources/app.yml @@ -22,11 +22,11 @@ server.request.maxFileSize: 100MB ######################################### solon.logging.appender: console: - level: "TRACE" + level: "INFO" solon.logging.logger: "root": #默认记录器配置 - level: "TRACE" + level: "INFO" "com.zaxxer.hikari": level: "WARN" diff --git a/snowy-web-app/src/test/java/apis/ApiDevTest.java b/snowy-web-app/src/test/java/apis/ApiDevTest.java index b4c3a51..fe6926d 100644 --- a/snowy-web-app/src/test/java/apis/ApiDevTest.java +++ b/snowy-web-app/src/test/java/apis/ApiDevTest.java @@ -1,15 +1,12 @@ package apis; -import org.junit.runner.RunWith; import org.noear.solon.test.HttpTestBase; -import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.SolonTest; import vip.xiaonuo.Application; /** * @author noear 2022/10/26 created */ -@RunWith(SolonJUnit4ClassRunner.class) @SolonTest(Application.class) public class ApiDevTest extends HttpTestBase { } diff --git a/snowy-web-app/src/test/java/apis/WelcomeTest.java b/snowy-web-app/src/test/java/apis/WelcomeTest.java index a4be9e1..f3cf4a9 100644 --- a/snowy-web-app/src/test/java/apis/WelcomeTest.java +++ b/snowy-web-app/src/test/java/apis/WelcomeTest.java @@ -1,16 +1,13 @@ package apis; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.noear.solon.test.HttpTestBase; -import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.SolonTest; import vip.xiaonuo.Application; /** * @author noear 2022/10/26 created */ -@RunWith(SolonJUnit4ClassRunner.class) @SolonTest(Application.class) public class WelcomeTest extends HttpTestBase { @Test diff --git a/snowy-web-app/src/test/java/vip/xiaonuo/MainTest.java b/snowy-web-app/src/test/java/vip/xiaonuo/MainTest.java index a602ba7..daac424 100644 --- a/snowy-web-app/src/test/java/vip/xiaonuo/MainTest.java +++ b/snowy-web-app/src/test/java/vip/xiaonuo/MainTest.java @@ -12,9 +12,7 @@ */ package vip.xiaonuo; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.noear.solon.test.SolonJUnit4ClassRunner; +import org.junit.jupiter.api.Test; import org.noear.solon.test.SolonTest; /** @@ -23,10 +21,8 @@ import org.noear.solon.test.SolonTest; * @author xuyuxiang * @date 2022/9/17 17:09 */ -@RunWith(SolonJUnit4ClassRunner.class) @SolonTest(Application.class) public class MainTest { - @Test public void test() { -- Gitee From 45a4b993c762ebfda6b8a57cb8ea8625e6ca1ff8 Mon Sep 17 00:00:00 2001 From: noear Date: Tue, 4 Jun 2024 11:56:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91solon?= =?UTF-8?q?=20=E5=8D=87=E4=B8=BA=202.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6beea3..d7b2158 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.noear solon-parent - 2.8.1 + 2.8.2 -- Gitee