wangli/axzo-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善Demo示例

Browse Source
This commit is contained in:
zhourui 周锐 2022-07-07 18:08:49 +08:00
parent 4a578b5fae
commit 5ac2946657
8 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
axzo-test-spring-boot-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.6</version>
<version>2.4.13</version>
<relativePath/>
</parent>
<groupId>cn.axzo.framework</groupId>
@ -47,7 +47,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>2.2.3.RELEASE</version>
<version>3.0.7</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

9
axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoComtroller.java
View File

@ -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";
}
}

5
axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServic.java
View File

@ -1,5 +0,0 @@
package cn.axzo.framework.test.demo;
public class DemoServic {
}

15
axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoService.java Normal file
View File

@ -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;
}
}

22
axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/DemoServiceTest.java
View File

@ -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() {
}
}

44
axzo-test-spring-boot-starter/src/main/resources/logback-spring.xml
View File

@ -3,43 +3,19 @@
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<!-- 变量 yudao.info.base-package，基础业务包 -->
<springProperty scope="context" name="appName" source="spring.application.name"/>
<!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
<property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%thread] [%tid] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
<!-- 格式化输出：%d 表示日期，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
<property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%thread] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
<property name="LOG_FILE" value="target/${appName}.log"/>
<!-- 控制台 Appender -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">　　　　　
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>${PATTERN_DEFAULT}</pattern>
</layout>
</encoder>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${PATTERN_DEFAULT}</pattern>
<charset>utf-8</charset>
</encoder>　　　　
</appender>
<!-- 文件 Appender -->
<!-- 参考 Spring Boot 的 file-appender.xml 编写 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>${PATTERN_DEFAULT}</pattern>
</layout>
</encoder>
<!-- 日志文件名 -->
<file>${LOG_FILE}</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- 滚动后的日志文件名 -->
<fileNamePattern>${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}</fileNamePattern>
<!-- 启动服务时，是否清理历史日志，一般不建议清理 -->
<cleanHistoryOnStart>${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}</cleanHistoryOnStart>
<!-- 日志文件，到达多少容量，进行滚动 -->
<maxFileSize>${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}</maxFileSize>
<!-- 日志文件的总大小，0 表示不限制 -->
<totalSizeCap>${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}</totalSizeCap>
<!-- 日志文件的保留天数 -->
<maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}</maxHistory>
</rollingPolicy>
</appender>
<!-- 本地环境 -->
<springProfile name="local,dev,test,unitest">
@ -47,11 +23,5 @@
<appender-ref ref="STDOUT"/>
</root>
</springProfile>
<!-- 其它环境 -->
<springProfile name="dev,test,test1,pre,master,default">
<root level="INFO">
<appender-ref ref="STDOUT"/>
</root>
</springProfile>
</configuration>

16
axzo-test-spring-boot-starter/src/main/java/cn/axzo/framework/test/demo/WorkspaceApiImplTest.java → axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoComtrollerTest.java
View File

@ -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<String,String> params = new HashMap<>();
doGetAction(url, params)
.andExpect(MockMvcResultMatchers.status().isOk())
.andExpect(MockMvcResultMatchers.content().string(containsString("Hello")))
.andReturn();
}

27
axzo-test-spring-boot-starter/src/test/java/cn/axzo/framework/test/demo/DemoServiceTest.java Normal file
View File

@ -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));
}
}