diff --git a/modules/cms-ai/src/test/resources/application.yml b/modules/cms-ai/src/test/resources/application.yml index 52095721..6753cf6b 100644 --- a/modules/cms-ai/src/test/resources/application.yml +++ b/modules/cms-ai/src/test/resources/application.yml @@ -1,16 +1,7 @@ -# 产品或项目名称、软件开发公司名称 -productName: JeeSite Demo -companyName: ThinkGem - -# 产品版本、版权年份 -productVersion: V5.13 -copyrightYear: 2025 - - # 数据库连接 -jdbc: - +jdbc: + # Mysql 数据库配置 type: mysql driver: com.mysql.cj.jdbc.Driver @@ -18,11 +9,7 @@ jdbc: username: root password: 123456 testSql: SELECT 1 - + # 日志配置 logging: config: classpath:logback-test.xml - -# 消息推送 -msg: - enabled: true diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 7ae3aabb..aea44e8f 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -1,5 +1,13 @@ # 温馨提示：不建议直接修改此文件，为了平台升级方便，建议将需要修改的参数值，复制到application.yml里进行覆盖该参数值。 +# 产品或项目名称、软件开发公司名称 +productName: JeeSite Demo +companyName: ThinkGem + +# 产品版本、版权年份 +productVersion: V5.13 +copyrightYear: 2025 + #======================================# #========== Database sttings ==========# #======================================# diff --git a/modules/core/src/test/resources/application.yml b/modules/core/src/test/resources/application.yml index 9f4e0472..6753cf6b 100644 --- a/modules/core/src/test/resources/application.yml +++ b/modules/core/src/test/resources/application.yml @@ -1,15 +1,7 @@ -# 产品或项目名称、软件开发公司名称 -productName: JeeSite Demo -companyName: ThinkGem - -# 产品版本、版权年份 -productVersion: V5.13 -copyrightYear: 2025 - # 数据库连接 -jdbc: - +jdbc: + # Mysql 数据库配置 type: mysql driver: com.mysql.cj.jdbc.Driver @@ -17,12 +9,7 @@ jdbc: username: root password: 123456 testSql: SELECT 1 - + # 日志配置 logging: config: classpath:logback-test.xml - -# 消息推送 -msg: - enabled: true - \ No newline at end of file diff --git a/modules/test/src/test/java/com/jeesite/test/ApplicationTest.java b/modules/test/src/test/java/com/jeesite/test/ApplicationTest.java new file mode 100644 index 00000000..f1165a30 --- /dev/null +++ b/modules/test/src/test/java/com/jeesite/test/ApplicationTest.java @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * No deletion without permission, or be held responsible to law. + */ +package com.jeesite.test; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.ActiveProfiles; + +/** + * JeeSite Web + * @author ThinkGem + * @version 2018-1-8 + */ +@ActiveProfiles("test") +@SpringBootApplication +public class ApplicationTest { + + public static void main(String[] args) { + SpringApplication.run(ApplicationTest.class, args); + } + +} \ No newline at end of file diff --git a/web/src/test/java/com/jeesite/test/InsertBatchTest.java b/modules/test/src/test/java/com/jeesite/test/InsertBatchTest.java similarity index 90% rename from web/src/test/java/com/jeesite/test/InsertBatchTest.java rename to modules/test/src/test/java/com/jeesite/test/InsertBatchTest.java index 4389f2eb..514f8ba2 100644 --- a/web/src/test/java/com/jeesite/test/InsertBatchTest.java +++ b/modules/test/src/test/java/com/jeesite/test/InsertBatchTest.java @@ -6,7 +6,6 @@ package com.jeesite.test; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.tests.BaseSpringContextTests; -import com.jeesite.modules.Application; import com.jeesite.modules.test.dao.TestDataDao; import com.jeesite.modules.test.entity.TestData; import org.junit.Test; @@ -22,7 +21,7 @@ import java.util.List; * @version 2019年10月28日 */ @ActiveProfiles("test") -@SpringBootTest(classes = Application.class) +@SpringBootTest(classes = ApplicationTest.class) public class InsertBatchTest extends BaseSpringContextTests { @Autowired diff --git a/web/src/test/java/com/jeesite/test/MultiDataSourceTest.java b/modules/test/src/test/java/com/jeesite/test/MultiDataSourceTest.java similarity index 93% rename from web/src/test/java/com/jeesite/test/MultiDataSourceTest.java rename to modules/test/src/test/java/com/jeesite/test/MultiDataSourceTest.java index f9cc4d82..3ffe26ac 100644 --- a/web/src/test/java/com/jeesite/test/MultiDataSourceTest.java +++ b/modules/test/src/test/java/com/jeesite/test/MultiDataSourceTest.java @@ -4,23 +4,21 @@ */ package com.jeesite.test; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - +import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.idgen.IdGen; +import com.jeesite.common.tests.BaseSpringContextTests; +import com.jeesite.modules.test.entity.TestData; +import com.jeesite.modules.test.entity.TestDataChild; +import com.jeesite.modules.test.service.TestDataService; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import com.jeesite.common.collect.ListUtils; -import com.jeesite.common.idgen.IdGen; -import com.jeesite.common.tests.BaseSpringContextTests; -import com.jeesite.modules.Application; -import com.jeesite.modules.test.entity.TestData; -import com.jeesite.modules.test.entity.TestDataChild; -import com.jeesite.modules.test.service.TestDataService; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** * 多数据源并发测试
@@ -31,7 +29,7 @@ import com.jeesite.modules.test.service.TestDataService; * @version 2019-6-26 */ @ActiveProfiles("test") -@SpringBootTest(classes = Application.class) +@SpringBootTest(classes = ApplicationTest.class) public class MultiDataSourceTest extends BaseSpringContextTests { @Autowired diff --git a/modules/test/src/test/resources/application.yml b/modules/test/src/test/resources/application.yml new file mode 100644 index 00000000..6753cf6b --- /dev/null +++ b/modules/test/src/test/resources/application.yml @@ -0,0 +1,15 @@ + +# 数据库连接 +jdbc: + + # Mysql 数据库配置 + type: mysql + driver: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai + username: root + password: 123456 + testSql: SELECT 1 + +# 日志配置 +logging: + config: classpath:logback-test.xml diff --git a/web-ai/src/test/java/logback-test.xml b/modules/test/src/test/resources/logback-test.xml similarity index 100% rename from web-ai/src/test/java/logback-test.xml rename to modules/test/src/test/resources/logback-test.xml diff --git a/web-api/src/test/java/logback-test.xml b/web-api/src/test/java/logback-test.xml deleted file mode 100644 index a9a15b7f..00000000 --- a/web-api/src/test/java/logback-test.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - %d{HH:mm:ss.SSS} %clr(%-5p) %clr([%-39logger{39}]){cyan} - %m%n%wEx - - - - - - - - - \ No newline at end of file diff --git a/web-fast/src/test/java/logback-test.xml b/web-fast/src/test/java/logback-test.xml deleted file mode 100644 index a9a15b7f..00000000 --- a/web-fast/src/test/java/logback-test.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - %d{HH:mm:ss.SSS} %clr(%-5p) %clr([%-39logger{39}]){cyan} - %m%n%wEx - - - - - - - - - \ No newline at end of file diff --git a/web/src/test/java/logback-test.xml b/web/src/test/java/logback-test.xml deleted file mode 100644 index a9a15b7f..00000000 --- a/web/src/test/java/logback-test.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - %d{HH:mm:ss.SSS} %clr(%-5p) %clr([%-39logger{39}]){cyan} - %m%n%wEx - - - - - - - - - \ No newline at end of file