test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/metersphere/server

This commit is contained in:
chenjianxing 2020-09-22 14:56:36 +08:00
parent 968ff5f470 178e22dca8
commit 1d2ef25f39
9 changed files with 104 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -12,6 +12,7 @@ import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.controller.request.QueryScheduleRequest;
import io.metersphere.dto.LicenseDTO;
import io.metersphere.dto.ScheduleDao;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresRoles;
@ -19,7 +20,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.List;
@RestController
@ -127,4 +127,10 @@ public class APITestController {
public List<ScheduleDao> listSchedule(@RequestBody QueryScheduleRequest request) {
return apiTestService.listSchedule(request);
}
@GetMapping("/license/valid")
public LicenseDTO valid() {
return apiTestService.validateLicense();
}
}

17
backend/src/main/java/io/metersphere/api/service/APITestService.java
View File

@ -12,7 +12,6 @@ import io.metersphere.api.parse.JmeterDocumentParser;
import io.metersphere.base.domain.*;
import io.metersphere.base.mapper.ApiTestFileMapper;
import io.metersphere.base.mapper.ApiTestMapper;
import io.metersphere.base.mapper.UserMapper;
import io.metersphere.base.mapper.ext.ExtApiTestMapper;
import io.metersphere.commons.constants.APITestStatus;
import io.metersphere.commons.constants.FileType;
@ -21,15 +20,13 @@ import io.metersphere.commons.constants.ScheduleType;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*;
import io.metersphere.controller.request.QueryScheduleRequest;
import io.metersphere.dto.LicenseDTO;
import io.metersphere.dto.ScheduleDao;
import io.metersphere.i18n.Translator;
import io.metersphere.job.sechedule.ApiTestJob;
import io.metersphere.notice.service.MailService;
import io.metersphere.notice.service.NoticeService;
import io.metersphere.service.FileService;
import io.metersphere.service.QuotaService;
import io.metersphere.service.ScheduleService;
import io.metersphere.service.UserService;
import io.metersphere.service.*;
import io.metersphere.track.service.TestCaseService;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.constants.CommonConstants;
@ -40,7 +37,6 @@ import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
@ -441,4 +437,13 @@ public class APITestService {
quotaService.checkAPITestQuota();
}
}
public LicenseDTO validateLicense() {
LicenseService licenseService = CommonBeanFactory.getBean(LicenseService.class);
if (licenseService != null) {
return licenseService.valid();
}
return null;
}
}

14
backend/src/main/java/io/metersphere/dto/LicenseDTO.java Normal file
View File

@ -0,0 +1,14 @@
package io.metersphere.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class LicenseDTO implements Serializable {
private String status;
private LicenseInfoDTO license;
}

21
backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java Normal file
View File

@ -0,0 +1,21 @@
package io.metersphere.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class LicenseInfoDTO implements Serializable {
// 客户名称
private String corporation;
// 授权截止时间
private String expired;
//产品名称
private String product;
//产品版本
private String edition;
//icense版本
private String licenseVersion;
//授权数量
private int licenseCount;
}

10
backend/src/main/java/io/metersphere/service/LicenseService.java Normal file
View File

@ -0,0 +1,10 @@
package io.metersphere.service;
import io.metersphere.dto.LicenseDTO;
public interface LicenseService {
public LicenseDTO valid();
public LicenseDTO addValidLicense(String reqLicenseCode);
}

9
backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
View File

@ -226,6 +226,7 @@ public class TestCaseReviewService {
public void deleteCaseReview(String reviewId) {
deleteCaseReviewProject(reviewId);
deleteCaseReviewUsers(reviewId);
deleteCaseReviewTestCase(reviewId);
testCaseReviewMapper.deleteByPrimaryKey(reviewId);
}
@ -241,6 +242,12 @@ public class TestCaseReviewService {
testCaseReviewUsersMapper.deleteByExample(testCaseReviewUsersExample);
}
private void deleteCaseReviewTestCase(String reviewId) {
TestCaseReviewTestCaseExample testCaseReviewTestCaseExample = new TestCaseReviewTestCaseExample();
testCaseReviewTestCaseExample.createCriteria().andReviewIdEqualTo(reviewId);
testCaseReviewTestCaseMapper.deleteByExample(testCaseReviewTestCaseExample);
}
public List<TestCaseReview> listCaseReviewAll(String currentWorkspaceId) {
ProjectExample projectExample = new ProjectExample();
projectExample.createCriteria().andWorkspaceIdEqualTo(currentWorkspaceId);
@ -384,7 +391,7 @@ public class TestCaseReviewService {
}
return name;
}
public List<TestReviewCaseDTO> listTestCaseByProjectIds(List<String> projectIds) {
QueryCaseReviewRequest request = new QueryCaseReviewRequest();
request.setProjectIds(projectIds);

4
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -281,8 +281,8 @@ public class TestCaseService {
errList.add(excelErrData);
excelResponse.setErrList(errList);
} else {
if (!xmindParser.testCases.isEmpty()) {
this.saveImportData(xmindParser.testCases, projectId);
if (!xmindParser.getTestCase().isEmpty()) {
this.saveImportData(xmindParser.getTestCase(), projectId);
xmindParser.clear();
}
excelResponse.setSuccess(true);

49
backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
View File

@ -1,6 +1,5 @@
package io.metersphere.xmind;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.metersphere.base.domain.TestCaseWithBLOBs;
@ -13,7 +12,7 @@ import io.metersphere.track.service.TestCaseService;
import io.metersphere.xmind.parser.XmindParser;
import io.metersphere.xmind.parser.pojo.Attached;
import io.metersphere.xmind.parser.pojo.JsonRootBean;
import org.springframework.util.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
@ -22,7 +21,7 @@ import java.util.regex.Pattern;
/**
* 数据转换
* 1 解析Xmind文件 XmindParser.parseJson
* 1 解析Xmind文件 XmindParser.parseObject
* 2 解析后的JSON this.parse 转成测试用例
*/
public class XmindCaseParser {
@ -33,10 +32,12 @@ public class XmindCaseParser {
private StringBuffer process; // 过程校验记录
// 已存在用例名称
private Set<String> testCaseNames;
// 转换后的案例信息
private List<TestCaseWithBLOBs> testCases;
// 案例详情重写了hashCode方法去重用
public List<TestCaseWithBLOBs> testCases;
// 用于重复对比
private List<TestCaseExcelData> xmindDataList;
private List<TestCaseExcelData> compartDatas;
public XmindCaseParser(TestCaseService testCaseService, String userId, String projectId, Set<String> testCaseNames) {
this.testCaseService = testCaseService;
@ -44,21 +45,25 @@ public class XmindCaseParser {
this.projectId = projectId;
this.testCaseNames = testCaseNames;
testCases = new LinkedList<>();
xmindDataList = new ArrayList<>();
compartDatas = new ArrayList<>();
process = new StringBuffer();
}
// 这里清理是为了 加快jvm 回收
public void clear() {
xmindDataList.clear();
compartDatas.clear();
testCases.clear();
testCaseNames.clear();
}
public List<TestCaseWithBLOBs> getTestCase() {
return this.testCases;
}
// 递归处理案例数据
private void recursion(StringBuffer processBuffer, Attached parent, int level, String nodePath, List<Attached> attacheds) {
for (Attached item : attacheds) {
if (isBlack(item.getTitle(), "(?:tc：|tc:|tc)")) { // 用例
if (isAvailable(item.getTitle(), "(?:tc：|tc:|tc)")) { // 用例
item.setParent(parent);
this.newTestCase(item.getTitle(), parent.getPath(), item.getChildren() != null ? item.getChildren().getAttached() : null);
} else {
@ -72,8 +77,7 @@ public class XmindCaseParser {
}
}
private boolean isBlack(String str, String regex) {
// regex = "(?:tc:|tc：)"
private boolean isAvailable(String str, String regex) {
if (StringUtils.isEmpty(str) || StringUtils.isEmpty(regex))
return false;
Pattern pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
@ -151,9 +155,9 @@ public class XmindCaseParser {
List<Attached> steps = new LinkedList<>();
if (attacheds != null && !attacheds.isEmpty()) {
attacheds.forEach(item -> {
if (isBlack(item.getTitle(), "(?:pc:|pc：)")) {
if (isAvailable(item.getTitle(), "(?:pc:|pc：)")) {
testCase.setPrerequisite(replace(item.getTitle(), "(?:pc:|pc：)"));
} else if (isBlack(item.getTitle(), "(?:rc:|rc：)")) {
} else if (isAvailable(item.getTitle(), "(?:rc:|rc：)")) {
testCase.setRemark(replace(item.getTitle(), "(?:rc:|rc：)"));
} else {
steps.add(item);
@ -174,7 +178,7 @@ public class XmindCaseParser {
}
TestCaseExcelData compartData = new TestCaseExcelData();
BeanUtils.copyBean(compartData, testCase);
if (xmindDataList.contains(compartData)) {
if (compartDatas.contains(compartData)) {
process.append(Translator.get("test_case_already_exists_excel") + "：" + testCase.getName() + "; ");
} else if (validate(testCase)) {
testCase.setId(UUID.randomUUID().toString());
@ -182,7 +186,7 @@ public class XmindCaseParser {
testCase.setUpdateTime(System.currentTimeMillis());
testCases.add(testCase);
}
xmindDataList.add(compartData);
compartDatas.add(compartData);
}
// 验证合法性
@ -190,21 +194,21 @@ public class XmindCaseParser {
String nodePath = data.getNodePath();
StringBuilder stringBuilder = new StringBuilder();
if (nodePath != null) {
if (!StringUtils.isEmpty(nodePath)) {
String[] nodes = nodePath.split("/");
if (nodes.length > TestCaseConstants.MAX_NODE_DEPTH + 1) {
stringBuilder.append(Translator.get("test_case_node_level_tip") +
TestCaseConstants.MAX_NODE_DEPTH + Translator.get("test_case_node_level") + "; ");
}
for (int i = 0; i < nodes.length; i++) {
if (i != 0 && org.apache.commons.lang3.StringUtils.equals(nodes[i].trim(), "")) {
if (i != 0 && StringUtils.equals(nodes[i].trim(), "")) {
stringBuilder.append(Translator.get("module_not_null") + "; ");
break;
}
}
}
if (org.apache.commons.lang3.StringUtils.equals(data.getType(), TestCaseConstants.Type.Functional.getValue()) && org.apache.commons.lang3.StringUtils.equals(data.getMethod(), TestCaseConstants.Method.Auto.getValue())) {
if (StringUtils.equals(data.getType(), TestCaseConstants.Type.Functional.getValue()) && StringUtils.equals(data.getMethod(), TestCaseConstants.Method.Auto.getValue())) {
stringBuilder.append(Translator.get("functional_method_tip") + "; ");
}
@ -230,13 +234,11 @@ public class XmindCaseParser {
StringBuffer processBuffer = new StringBuffer();
try {
// 获取思维导图内容
String content = XmindParser.parseJson(multipartFile);
JsonRootBean root = JSON.parseObject(content, JsonRootBean.class);
JsonRootBean root = XmindParser.parseObject(multipartFile);
if (root != null && root.getRootTopic() != null && root.getRootTopic().getChildren() != null) {
// 判断是模块还是用例
for (Attached item : root.getRootTopic().getChildren().getAttached()) {
if (isBlack(item.getTitle(), "(?:tc:|tc：|tc)")) { // 用例
if (isAvailable(item.getTitle(), "(?:tc:|tc：|tc)")) { // 用例
return replace(item.getTitle(), "(?:tc:|tc：|tc)") + "：" + Translator.get("test_case_create_module_fail");
} else {
item.setPath(item.getTitle());
@ -247,9 +249,6 @@ public class XmindCaseParser {
}
}
}
//if (StringUtils.isEmpty(process.toString()) && !testCaseWithBLOBs.isEmpty()) {
// testCaseService.saveImportData(testCaseWithBLOBs, projectId);
//}
} catch (Exception ex) {
processBuffer.append(Translator.get("incorrect_format"));
LogUtil.error(ex.getMessage());

21
frontend/src/business/App.vue
View File

@ -2,7 +2,7 @@
<el-col v-if="auth">
<el-row id="header-top1" type="flex" justify="space-between" align="middle">
<el-col>
<div class="license-head" v-if="valid === true && validData.status == 'expired'">License has expired since
<div class="license-head" v-if="validData.status == 'expired'">License has expired since
{{(validData!= undefined && validData.license!= undefined) ? validData.license.expired:''}},please
update license.
</div>
@ -40,15 +40,7 @@
export default {
name: 'app',
data() {
let xpack = false;
Setting.children.forEach(child => {
if (child.path === "license") {
xpack = true;
return;
}
})
return {
valid: xpack,
validData: {},
auth: false
}
@ -67,13 +59,14 @@
});
},
beforeMount() {
if (this.valid === true) {
// 验证license
this.result = this.$get("/license/valid", response => {
// 验证license
this.result = this.$get("/api/license/valid", response => {
let data = response.data;
if (data != undefined && data != null) {
this.validData = response.data;
saveLicense(response.data);
});
}
}
});
},
components: {MsLanguageSwitch, MsUser, MsView, MsTopMenus, MsHeaderOrgWs},
methods: {}