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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
liqiang-fit2cloud 2022-10-14 15:03:55 +08:00
parent 56991f0c17 3c3c1a3f40
commit 440ef526bf
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/constants/ParamConstants.java
View File

@ -113,6 +113,7 @@ public interface ParamConstants {
enum BASE implements ParamConstants { enum BASE implements ParamConstants {
URL("base.url"), URL("base.url"),
CONCURRENCY("base.concurrency"), CONCURRENCY("base.concurrency"),
GRID_CONCURRENCY("base.grid.concurrency"),
PROMETHEUS_HOST("base.prometheus.host"), PROMETHEUS_HOST("base.prometheus.host"),
SELENIUM_DOCKER_URL("base.selenium.docker.url"); SELENIUM_DOCKER_URL("base.selenium.docker.url");

2
system-setting/backend/src/main/resources/db/migration/V131__2.3.0__release.sql
View File

@ -9,6 +9,6 @@ INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('meter
INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('metersphere.module.track', 'ENABLE', 'text', 1); INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('metersphere.module.track', 'ENABLE', 'text', 1);
INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('metersphere.module.project', 'ENABLE', 'text', 1); INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('metersphere.module.project', 'ENABLE', 'text', 1);
INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('metersphere.module.setting', 'ENABLE', 'text', 1); INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('metersphere.module.setting', 'ENABLE', 'text', 1);
INSERT INTO metersphere.system_parameter (param_key, param_value, type, sort) VALUES ('base.grid.concurrency', '8', 'text', 1);

1
test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
View File

@ -2258,7 +2258,6 @@ public class TestCaseService {
public List<TestCase> getTestCaseByProjectId(String projectId) { public List<TestCase> getTestCaseByProjectId(String projectId) {
TestCaseExample example = new TestCaseExample(); TestCaseExample example = new TestCaseExample();
example.createCriteria().andProjectIdEqualTo(projectId).andStatusNotEqualTo("Trash").andLatestEqualTo(true); example.createCriteria().andProjectIdEqualTo(projectId).andStatusNotEqualTo("Trash").andLatestEqualTo(true);
example.or().andProjectIdEqualTo(projectId).andStatusIsNull().andLatestEqualTo(true);
return testCaseMapper.selectByExample(example); return testCaseMapper.selectByExample(example);
} }