yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SpringCloud运行环境，排除system模块jar中的application*.yaml配置文件 

测试类默认注释掉，减少启动问题
yml格式不规范，导致启动报错
This commit is contained in:
zhangdaiscott 2022-05-18 16:16:36 +08:00
parent 2e90f73da2
commit a6ae4080cb
8 changed files with 312 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jeecg-boot/jeecg-boot-module-system/pom.xml
View File

@ -61,10 +61,28 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<!--微服务模式下修改为true,跳过SpringBoot启动打包插件，否则微服务模块无法引用-->
<!--SpringCloud运行环境 ,值改为true跳过SpringBoot启动打包插件 -->
<skip>${skip.springboot.maven}</skip>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<!-- SpringCloud运行环境 -->
<profile>
<id>SpringCloud</id>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>application.yml</exclude>
<exclude>application-*.yml</exclude>
</excludes>
</resource>
</resources>
</build>
</profile>
</profiles>
</project>

128
jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
View File

@ -1,64 +1,64 @@
package org.jeecg;
import org.jeecg.modules.demo.mock.MockController;
import org.jeecg.modules.demo.test.entity.JeecgDemo;
import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
import org.jeecg.modules.demo.test.service.IJeecgDemoService;
import org.jeecg.modules.system.service.ISysDataLogService;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
import java.util.List;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
public class SampleTest {
@Resource
private JeecgDemoMapper jeecgDemoMapper;
@Resource
private IJeecgDemoService jeecgDemoService;
@Resource
private ISysDataLogService sysDataLogService;
@Resource
private MockController mock;
@Test
public void testSelect() {
System.out.println(("----- selectAll method test ------"));
List<JeecgDemo> userList = jeecgDemoMapper.selectList(null);
Assert.assertEquals(5, userList.size());
userList.forEach(System.out::println);
}
@Test
public void testXmlSql() {
System.out.println(("----- selectAll method test ------"));
List<JeecgDemo> userList = jeecgDemoMapper.getDemoByName("Sandy12");
userList.forEach(System.out::println);
}
/**
* 测试事务
*/
@Test
public void testTran() {
jeecgDemoService.testTran();
}
/**
* 测试数据日志添加
*/
@Test
public void testDataLogSave() {
System.out.println(("----- datalog test ------"));
String tableName = "jeecg_demo";
String dataId = "4028ef81550c1a7901550c1cd6e70001";
String dataContent = mock.sysDataLogJson();
sysDataLogService.addDataLog(tableName, dataId, dataContent);
}
}
//package org.jeecg;
//
//import org.jeecg.modules.demo.mock.MockController;
//import org.jeecg.modules.demo.test.entity.JeecgDemo;
//import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
//import org.jeecg.modules.demo.test.service.IJeecgDemoService;
//import org.jeecg.modules.system.service.ISysDataLogService;
//import org.junit.Assert;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import javax.annotation.Resource;
//import java.util.List;
//
//@RunWith(SpringRunner.class)
//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
//public class SampleTest {
//
// @Resource
// private JeecgDemoMapper jeecgDemoMapper;
// @Resource
// private IJeecgDemoService jeecgDemoService;
// @Resource
// private ISysDataLogService sysDataLogService;
// @Resource
// private MockController mock;
//
// @Test
// public void testSelect() {
// System.out.println(("----- selectAll method test ------"));
// List<JeecgDemo> userList = jeecgDemoMapper.selectList(null);
// Assert.assertEquals(5, userList.size());
// userList.forEach(System.out::println);
// }
//
// @Test
// public void testXmlSql() {
// System.out.println(("----- selectAll method test ------"));
// List<JeecgDemo> userList = jeecgDemoMapper.getDemoByName("Sandy12");
// userList.forEach(System.out::println);
// }
//
// /**
// * 测试事务
// */
// @Test
// public void testTran() {
// jeecgDemoService.testTran();
// }
//
// /**
// * 测试数据日志添加
// */
// @Test
// public void testDataLogSave() {
// System.out.println(("----- datalog test ------"));
// String tableName = "jeecg_demo";
// String dataId = "4028ef81550c1a7901550c1cd6e70001";
// String dataContent = mock.sysDataLogJson();
// sysDataLogService.addDataLog(tableName, dataId, dataContent);
// }
//}

358
jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
View File

@ -1,179 +1,179 @@
package org.jeecg.modules.system.test;
import org.jeecg.JeecgSystemApplication;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.RestUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import com.alibaba.fastjson.JSONObject;
import org.springframework.http.ResponseEntity;
/**
* 系统用户单元测试
*/
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"})
public class SysUserTest {
/**
* 测试地址：实际使用时替换成你自己的地址
*/
private final String BASE_URL = "http://localhost:8080/jeecg-boot/sys/user/";
//测试：用户名和密码
private final String USERNAME = "admin";
private final String PASSWORD = "123456";
@Autowired
private RedisUtil redisUtil;
/**
* 测试用例：查询记录
*/
@Test
public void testQuery() {
// 请求地址
String url = BASE_URL + "list";
// 请求 Header （用于传递Token）
HttpHeaders headers = this.getHeaders();
// 请求方式是 GET 代表获取数据
HttpMethod method = HttpMethod.GET;
System.out.println("请求地址：" + url);
System.out.println("请求方式：" + method);
// 利用 RestUtil 请求该url
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
if (result != null && result.getBody() != null) {
System.out.println("返回结果：" + result.getBody().toJSONString());
} else {
System.out.println("查询失败");
}
}
/**
* 测试用例：新增
*/
@Test
public void testAdd() {
// 请求地址
String url = BASE_URL + "add" ;
// 请求 Header （用于传递Token）
HttpHeaders headers = this.getHeaders();
// 请求方式是 POST 代表提交新增数据
HttpMethod method = HttpMethod.POST;
System.out.println("请求地址：" + url);
System.out.println("请求方式：" + method);
JSONObject params = new JSONObject();
params.put("username", "wangwuTest");
params.put("password", "123456");
params.put("confirmpassword","123456");
params.put("realname", "单元测试");
params.put("activitiSync", "1");
params.put("userIdentity","1");
params.put("workNo","0025");
System.out.println("请求参数：" + params.toJSONString());
// 利用 RestUtil 请求该url
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
if (result != null && result.getBody() != null) {
System.out.println("返回结果：" + result.getBody().toJSONString());
} else {
System.out.println("查询失败");
}
}
/**
* 测试用例：修改
*/
@Test
public void testEdit() {
// 数据Id
String dataId = "1331795062924374018";
// 请求地址
String url = BASE_URL + "edit";
// 请求 Header （用于传递Token）
HttpHeaders headers = this.getHeaders();
// 请求方式是 PUT 代表提交修改数据
HttpMethod method = HttpMethod.PUT;
System.out.println("请求地址：" + url);
System.out.println("请求方式：" + method);
JSONObject params = new JSONObject();
params.put("username", "wangwuTest");
params.put("realname", "单元测试1111");
params.put("activitiSync", "1");
params.put("userIdentity","1");
params.put("workNo","0025");
params.put("id",dataId);
System.out.println("请求参数：" + params.toJSONString());
// 利用 RestUtil 请求该url
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
if (result != null && result.getBody() != null) {
System.out.println("返回结果：" + result.getBody().toJSONString());
} else {
System.out.println("查询失败");
}
}
/**
* 测试用例：删除
*/
@Test
public void testDelete() {
// 数据Id
String dataId = "1331795062924374018";
// 请求地址
String url = BASE_URL + "delete" + "?id=" + dataId;
// 请求 Header （用于传递Token）
HttpHeaders headers = this.getHeaders();
// 请求方式是 DELETE 代表删除数据
HttpMethod method = HttpMethod.DELETE;
System.out.println("请求地址：" + url);
System.out.println("请求方式：" + method);
// 利用 RestUtil 请求该url
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
if (result != null && result.getBody() != null) {
System.out.println("返回结果：" + result.getBody().toJSONString());
} else {
System.out.println("查询失败");
}
}
private String getToken() {
String token = JwtUtil.sign(USERNAME, PASSWORD);
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60);
return token;
}
private HttpHeaders getHeaders() {
String token = this.getToken();
System.out.println("请求Token：" + token);
HttpHeaders headers = new HttpHeaders();
String mediaType = MediaType.APPLICATION_JSON_VALUE;
headers.setContentType(MediaType.parseMediaType(mediaType));
headers.set("Accept", mediaType);
headers.set("X-Access-Token", token);
return headers;
}
}
//package org.jeecg.modules.system.test;
//
//import org.jeecg.JeecgSystemApplication;
//import org.jeecg.common.constant.CommonConstant;
//import org.jeecg.common.system.util.JwtUtil;
//import org.jeecg.common.util.RedisUtil;
//import org.jeecg.common.util.RestUtil;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.ActiveProfiles;
//import org.springframework.test.context.junit4.SpringRunner;
//import org.springframework.http.HttpHeaders;
//import org.springframework.http.HttpMethod;
//import org.springframework.http.MediaType;
//import com.alibaba.fastjson.JSONObject;
//import org.springframework.http.ResponseEntity;
//
///**
// * 系统用户单元测试
// */
//@RunWith(SpringRunner.class)
//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
//@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"})
//public class SysUserTest {
// /**
// * 测试地址：实际使用时替换成你自己的地址
// */
// private final String BASE_URL = "http://localhost:8080/jeecg-boot/sys/user/";
// //测试：用户名和密码
// private final String USERNAME = "admin";
// private final String PASSWORD = "123456";
// @Autowired
// private RedisUtil redisUtil;
//
// /**
// * 测试用例：查询记录
// */
// @Test
// public void testQuery() {
// // 请求地址
// String url = BASE_URL + "list";
// // 请求 Header （用于传递Token）
// HttpHeaders headers = this.getHeaders();
// // 请求方式是 GET 代表获取数据
// HttpMethod method = HttpMethod.GET;
//
// System.out.println("请求地址：" + url);
// System.out.println("请求方式：" + method);
//
// // 利用 RestUtil 请求该url
// ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
// if (result != null && result.getBody() != null) {
// System.out.println("返回结果：" + result.getBody().toJSONString());
// } else {
// System.out.println("查询失败");
// }
// }
//
// /**
// * 测试用例：新增
// */
// @Test
// public void testAdd() {
// // 请求地址
// String url = BASE_URL + "add" ;
// // 请求 Header （用于传递Token）
// HttpHeaders headers = this.getHeaders();
// // 请求方式是 POST 代表提交新增数据
// HttpMethod method = HttpMethod.POST;
//
// System.out.println("请求地址：" + url);
// System.out.println("请求方式：" + method);
//
// JSONObject params = new JSONObject();
// params.put("username", "wangwuTest");
// params.put("password", "123456");
// params.put("confirmpassword","123456");
// params.put("realname", "单元测试");
// params.put("activitiSync", "1");
// params.put("userIdentity","1");
// params.put("workNo","0025");
//
// System.out.println("请求参数：" + params.toJSONString());
//
// // 利用 RestUtil 请求该url
// ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
// if (result != null && result.getBody() != null) {
// System.out.println("返回结果：" + result.getBody().toJSONString());
// } else {
// System.out.println("查询失败");
// }
// }
//
//
// /**
// * 测试用例：修改
// */
// @Test
// public void testEdit() {
// // 数据Id
// String dataId = "1331795062924374018";
// // 请求地址
// String url = BASE_URL + "edit";
// // 请求 Header （用于传递Token）
// HttpHeaders headers = this.getHeaders();
// // 请求方式是 PUT 代表提交修改数据
// HttpMethod method = HttpMethod.PUT;
//
// System.out.println("请求地址：" + url);
// System.out.println("请求方式：" + method);
//
// JSONObject params = new JSONObject();
// params.put("username", "wangwuTest");
// params.put("realname", "单元测试1111");
// params.put("activitiSync", "1");
// params.put("userIdentity","1");
// params.put("workNo","0025");
// params.put("id",dataId);
//
// System.out.println("请求参数：" + params.toJSONString());
//
// // 利用 RestUtil 请求该url
// ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
// if (result != null && result.getBody() != null) {
// System.out.println("返回结果：" + result.getBody().toJSONString());
// } else {
// System.out.println("查询失败");
// }
// }
//
//
// /**
// * 测试用例：删除
// */
// @Test
// public void testDelete() {
// // 数据Id
// String dataId = "1331795062924374018";
// // 请求地址
// String url = BASE_URL + "delete" + "?id=" + dataId;
// // 请求 Header （用于传递Token）
// HttpHeaders headers = this.getHeaders();
// // 请求方式是 DELETE 代表删除数据
// HttpMethod method = HttpMethod.DELETE;
//
// System.out.println("请求地址：" + url);
// System.out.println("请求方式：" + method);
//
// // 利用 RestUtil 请求该url
// ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
// if (result != null && result.getBody() != null) {
// System.out.println("返回结果：" + result.getBody().toJSONString());
// } else {
// System.out.println("查询失败");
// }
// }
//
//
// private String getToken() {
// String token = JwtUtil.sign(USERNAME, PASSWORD);
// redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
// redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60);
// return token;
// }
//
// private HttpHeaders getHeaders() {
// String token = this.getToken();
// System.out.println("请求Token：" + token);
//
// HttpHeaders headers = new HttpHeaders();
// String mediaType = MediaType.APPLICATION_JSON_VALUE;
// headers.setContentType(MediaType.parseMediaType(mediaType));
// headers.set("Accept", mediaType);
// headers.set("X-Access-Token", token);
// return headers;
// }
//}

0
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml
View File