diff --git a/axzo-test-spring-boot-starter/pom.xml b/axzo-test-spring-boot-starter/pom.xml
index 0ced69a..2158e2c 100644
--- a/axzo-test-spring-boot-starter/pom.xml
+++ b/axzo-test-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.6
+ 2.4.13
cn.axzo.framework
@@ -47,7 +47,7 @@
org.springframework.cloud
spring-cloud-starter-openfeign
- 2.2.3.RELEASE
+ 3.0.7
org.springframework.boot
diff --git a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoComtroller.java b/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoComtroller.java
index 907333e..27f6766 100644
--- a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoComtroller.java
+++ b/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoComtroller.java
@@ -1,5 +1,14 @@
package cn.axzo.framework.test.demo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
public class DemoComtroller {
+
+ @GetMapping("/hello")
+ public String hello() {
+ return "Hello";
+ }
}
diff --git a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServic.java b/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServic.java
deleted file mode 100644
index 959ff8c..0000000
--- a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServic.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package cn.axzo.framework.test.demo;
-
-public class DemoServic {
-
-}
diff --git a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoService.java b/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoService.java
new file mode 100644
index 0000000..949cd52
--- /dev/null
+++ b/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoService.java
@@ -0,0 +1,15 @@
+package cn.axzo.framework.test.demo;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Demo演示
+ */
+@Service
+public class DemoService {
+
+ public Long plus(Long val1, Long val2) {
+ return val1 + val2;
+ }
+
+}
diff --git a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServiceTest.java b/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServiceTest.java
deleted file mode 100644
index 768200f..0000000
--- a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServiceTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- *
- */
-package cn.axzo.framework.test.demo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-import cn.axzo.framework.test.ServiceTestSupport;
-
-@SpringBootApplication(scanBasePackages = "cn.axzo")
-@EnableFeignClients(basePackages = "cn.axzo")
-public class DemoServiceTest extends ServiceTestSupport{
-
-
- @Test
- void testDemo() {
-
- }
-
-}
diff --git a/axzo-test-spring-boot-starter/src/main/resources/logback-spring.xml b/axzo-test-spring-boot-starter/src/main/resources/logback-spring.xml
index ae8c909..791f80d 100644
--- a/axzo-test-spring-boot-starter/src/main/resources/logback-spring.xml
+++ b/axzo-test-spring-boot-starter/src/main/resources/logback-spring.xml
@@ -3,43 +3,19 @@
-
-
+
+
-
-
-
- ${PATTERN_DEFAULT}
-
-
+
+
+ ${PATTERN_DEFAULT}
+ utf-8
+
-
-
-
-
-
- ${PATTERN_DEFAULT}
-
-
-
- ${LOG_FILE}
-
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
-
-
@@ -47,11 +23,5 @@
-
-
-
-
-
-
diff --git a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/WorkspaceApiImplTest.java b/axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoComtrollerTest.java
similarity index 70%
rename from axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/WorkspaceApiImplTest.java
rename to axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoComtrollerTest.java
index 5d77988..49b0139 100644
--- a/axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/WorkspaceApiImplTest.java
+++ b/axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoComtrollerTest.java
@@ -1,5 +1,10 @@
package cn.axzo.framework.test.demo;
+import static org.hamcrest.CoreMatchers.containsString;
+
+import java.util.HashMap;
+import java.util.Map;
+
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,6 +18,7 @@ import cn.axzo.framework.test.ControllerTestSupport;
@EnableFeignClients(basePackages = "cn.axzo.framework.test.demo")
class DemoComtrollerTest extends ControllerTestSupport{
+
@Autowired
DemoComtroller api;
@@ -22,12 +28,12 @@ class DemoComtrollerTest extends ControllerTestSupport{
}
@Test
- void testDemo() throws Exception {
- String url = "/api/workspace/queryWorkspace";
- //设置请求参数
- Object query = new Object();
- doPostAction(url, query)
+ void testHello() throws Exception {
+ String url = "/hello";
+ Map params = new HashMap<>();
+ doGetAction(url, params)
.andExpect(MockMvcResultMatchers.status().isOk())
+ .andExpect(MockMvcResultMatchers.content().string(containsString("Hello")))
.andReturn();
}
diff --git a/axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoServiceTest.java b/axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoServiceTest.java
new file mode 100644
index 0000000..f2fb493
--- /dev/null
+++ b/axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoServiceTest.java
@@ -0,0 +1,27 @@
+/**
+ *
+ */
+package cn.axzo.framework.test.demo;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+import cn.axzo.framework.test.ServiceTestSupport;
+
+@SpringBootApplication(scanBasePackages = "cn.axzo.framework.test.demo")
+@EnableFeignClients(basePackages = "cn.axzo.framework.test.demo")
+public class DemoServiceTest extends ServiceTestSupport{
+
+ @Autowired
+ private DemoService service;
+
+ @Test
+ void testPlus() {
+ assertEquals(2L, service.plus(1L, 1L));
+ }
+
+}