diff --git a/web-api/src/main/java/com/jeesite/modules/Application.java b/web-api/src/main/java/com/jeesite/modules/ApiApplication.java similarity index 79% rename from web-api/src/main/java/com/jeesite/modules/Application.java rename to web-api/src/main/java/com/jeesite/modules/ApiApplication.java index 0af94171..5c6939e5 100644 --- a/web-api/src/main/java/com/jeesite/modules/Application.java +++ b/web-api/src/main/java/com/jeesite/modules/ApiApplication.java @@ -15,16 +15,16 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * @version 2018-10-13 */ @SpringBootApplication -public class Application extends SpringBootServletInitializer { +public class ApiApplication extends SpringBootServletInitializer { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(ApiApplication.class, args); } @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { this.setRegisterErrorPageFilter(false); // 错误页面有容器来处理,而不是SpringBoot - return builder.sources(Application.class); + return builder.sources(ApiApplication.class); } } \ No newline at end of file diff --git a/web-api/src/test/java/com/jeesite/test/InitData.java b/web-api/src/test/java/com/jeesite/test/InitData.java index 8487edd7..7458f190 100644 --- a/web-api/src/test/java/com/jeesite/test/InitData.java +++ b/web-api/src/test/java/com/jeesite/test/InitData.java @@ -9,7 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import com.jeesite.common.tests.BaseInitDataTests; -import com.jeesite.modules.Application; +import com.jeesite.modules.ApiApplication; /** * 初始化数据表 @@ -17,7 +17,7 @@ import com.jeesite.modules.Application; * @version 2020-5-26 */ @ActiveProfiles("test") -@SpringBootTest(classes=Application.class) +@SpringBootTest(classes = ApiApplication.class) public class InitData extends BaseInitDataTests { @Test diff --git a/web-api/src/test/java/com/jeesite/test/InsertBatchTest.java b/web-api/src/test/java/com/jeesite/test/InsertBatchTest.java index 4046a535..a32e7569 100644 --- a/web-api/src/test/java/com/jeesite/test/InsertBatchTest.java +++ b/web-api/src/test/java/com/jeesite/test/InsertBatchTest.java @@ -14,7 +14,7 @@ import org.springframework.test.context.ActiveProfiles; import com.jeesite.common.callback.MethodCallback; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.tests.BaseSpringContextTests; -import com.jeesite.modules.Application; +import com.jeesite.modules.ApiApplication; import com.jeesite.modules.test.dao.TestDataDao; import com.jeesite.modules.test.entity.TestData; @@ -24,7 +24,7 @@ import com.jeesite.modules.test.entity.TestData; * @version 2019年10月28日 */ @ActiveProfiles("test") -@SpringBootTest(classes=Application.class) +@SpringBootTest(classes = ApiApplication.class) public class InsertBatchTest extends BaseSpringContextTests { @Autowired diff --git a/web-api/src/test/java/com/jeesite/test/MultiDataSourceTest.java b/web-api/src/test/java/com/jeesite/test/MultiDataSourceTest.java index d2ea1e82..8f50316d 100644 --- a/web-api/src/test/java/com/jeesite/test/MultiDataSourceTest.java +++ b/web-api/src/test/java/com/jeesite/test/MultiDataSourceTest.java @@ -17,7 +17,7 @@ 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.ApiApplication; import com.jeesite.modules.test.entity.TestData; import com.jeesite.modules.test.entity.TestDataChild; import com.jeesite.modules.test.service.TestDataService; @@ -31,7 +31,7 @@ import com.jeesite.modules.test.service.TestDataService; * @version 2019-6-26 */ @ActiveProfiles("test") -@SpringBootTest(classes=Application.class) +@SpringBootTest(classes = ApiApplication.class) public class MultiDataSourceTest extends BaseSpringContextTests { @Autowired