From b70d84b11796187ffce4caf487a457bdbb0b76c9 Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Mon, 17 May 2021 17:14:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=8E=AF=E5=A2=83=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E9=87=8F=E5=9C=A8=E8=84=9A=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E7=8E=AF=E5=A2=83=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=80=BC=E4=B9=9F=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 环境里的变量在脚本中修改后环境中的值也同步修改 --- .../metersphere/api/jmeter/RunningParam.java | 12 - .../ApiEnvironmentRunningParamService.java | 126 ++-- .../domain/ApiEnvironmentRunningParam.java | 25 - .../ApiEnvironmentRunningParamExample.java | 670 ------------------ .../ApiEnvironmentRunningParamMapper.java | 36 - .../ApiEnvironmentRunningParamMapper.xml | 304 -------- .../db/migration/V83__v1.10_release.sql | 18 - .../common/Jsr233ProcessorContent.vue | 12 - 8 files changed, 65 insertions(+), 1138 deletions(-) delete mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParam.java delete mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParamExample.java delete mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.java delete mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.xml diff --git a/backend/src/main/java/io/metersphere/api/jmeter/RunningParam.java b/backend/src/main/java/io/metersphere/api/jmeter/RunningParam.java index 1373a6fcfe..ef0c8fed6b 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/RunningParam.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/RunningParam.java @@ -16,18 +16,6 @@ public class RunningParam { } public static void deleteParam(String enviromentId, String key){ - checkService(); - apiEnvironmentRunningParamService.deleteParam(enviromentId,key); - } - - public static String getParam(String enviromentId, String key){ - checkService(); - return apiEnvironmentRunningParamService.getParam(enviromentId,key); - } - - public static String showParams(String enviromentId){ - checkService(); - return apiEnvironmentRunningParamService.showParams(enviromentId); } public static void checkService(){ diff --git a/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java b/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java index 123bd74011..fd34b3d46e 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java @@ -1,19 +1,14 @@ package io.metersphere.api.service; import com.alibaba.fastjson.JSONArray; -import io.metersphere.base.domain.ApiEnvironmentRunningParam; -import io.metersphere.base.domain.ApiEnvironmentRunningParamExample; -import io.metersphere.base.mapper.ApiEnvironmentRunningParamMapper; -import io.metersphere.commons.utils.SessionUtils; +import com.alibaba.fastjson.JSONObject; +import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs; +import io.metersphere.commons.exception.MSException; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; /** * @author song.tianyang @@ -23,66 +18,75 @@ import java.util.UUID; @Transactional(rollbackFor = Exception.class) public class ApiEnvironmentRunningParamService { @Resource - ApiEnvironmentRunningParamMapper apiEnvironmentRunningParamMapper; + ApiTestEnvironmentService apiTestEnvironmentService; public synchronized void addParam(String enviromentId, String key, String value) { if(StringUtils.isEmpty(key)){ return; } - ApiEnvironmentRunningParamExample example = new ApiEnvironmentRunningParamExample(); - example.createCriteria().andApiEnviromentIdEqualTo(enviromentId).andKeyEqualTo(key); - List list = apiEnvironmentRunningParamMapper.selectByExampleWithBLOBs(example); - long timeStamp = System.currentTimeMillis(); - String userId = SessionUtils.getUserId(); - if(list.isEmpty()){ - ApiEnvironmentRunningParam model = new ApiEnvironmentRunningParam(); - model.setApiEnviromentId(enviromentId); - model.setKey(key); - model.setValue(value); - model.setCreateUserId(userId); - model.setId(UUID.randomUUID().toString()); - model.setCreateTime(timeStamp); - model.setUpdateTime(timeStamp); - model.setUpdateUserId(userId); - apiEnvironmentRunningParamMapper.insert(model); + ApiTestEnvironmentWithBLOBs apiTestEnvironmentWithBLOBs = apiTestEnvironmentService.get(enviromentId); + if(apiTestEnvironmentWithBLOBs == null ){ + MSException.throwException("Unable find environment!"); + } + + JSONObject configObj = JSONObject.parseObject(apiTestEnvironmentWithBLOBs.getConfig()); + if(configObj.containsKey("commonConfig")){ + JSONObject commonConfig = configObj.getJSONObject("commonConfig"); + if(commonConfig.containsKey("variables")){ + JSONArray variables = commonConfig.getJSONArray("variables"); + boolean contains = false; + for(int i = 0;i list = apiEnvironmentRunningParamMapper.selectByExampleWithBLOBs(example); - if(list.isEmpty()){ - return ""; - }else { - return list.get(0).getValue(); - } - } - - public String showParams(String enviromentId) { - Map paramMap = new LinkedHashMap<>(); - - ApiEnvironmentRunningParamExample example = new ApiEnvironmentRunningParamExample(); - example.createCriteria().andApiEnviromentIdEqualTo(enviromentId); - List list = apiEnvironmentRunningParamMapper.selectByExampleWithBLOBs(example); - - for (ApiEnvironmentRunningParam model: - list) { - paramMap.put(model.getKey(),model.getValue()); - } - - return JSONArray.toJSONString(paramMap); - } } diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParam.java b/backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParam.java deleted file mode 100644 index e9e8da3cab..0000000000 --- a/backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParam.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.metersphere.base.domain; - -import java.io.Serializable; -import lombok.Data; - -@Data -public class ApiEnvironmentRunningParam implements Serializable { - private String id; - - private String apiEnviromentId; - - private String key; - - private Long createTime; - - private Long updateTime; - - private String createUserId; - - private String updateUserId; - - private String value; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParamExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParamExample.java deleted file mode 100644 index 43d2ca6154..0000000000 --- a/backend/src/main/java/io/metersphere/base/domain/ApiEnvironmentRunningParamExample.java +++ /dev/null @@ -1,670 +0,0 @@ -package io.metersphere.base.domain; - -import java.util.ArrayList; -import java.util.List; - -public class ApiEnvironmentRunningParamExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ApiEnvironmentRunningParamExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdIsNull() { - addCriterion("api_enviroment_id is null"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdIsNotNull() { - addCriterion("api_enviroment_id is not null"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdEqualTo(String value) { - addCriterion("api_enviroment_id =", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdNotEqualTo(String value) { - addCriterion("api_enviroment_id <>", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdGreaterThan(String value) { - addCriterion("api_enviroment_id >", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdGreaterThanOrEqualTo(String value) { - addCriterion("api_enviroment_id >=", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdLessThan(String value) { - addCriterion("api_enviroment_id <", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdLessThanOrEqualTo(String value) { - addCriterion("api_enviroment_id <=", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdLike(String value) { - addCriterion("api_enviroment_id like", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdNotLike(String value) { - addCriterion("api_enviroment_id not like", value, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdIn(List values) { - addCriterion("api_enviroment_id in", values, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdNotIn(List values) { - addCriterion("api_enviroment_id not in", values, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdBetween(String value1, String value2) { - addCriterion("api_enviroment_id between", value1, value2, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andApiEnviromentIdNotBetween(String value1, String value2) { - addCriterion("api_enviroment_id not between", value1, value2, "apiEnviromentId"); - return (Criteria) this; - } - - public Criteria andKeyIsNull() { - addCriterion("`key` is null"); - return (Criteria) this; - } - - public Criteria andKeyIsNotNull() { - addCriterion("`key` is not null"); - return (Criteria) this; - } - - public Criteria andKeyEqualTo(String value) { - addCriterion("`key` =", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyNotEqualTo(String value) { - addCriterion("`key` <>", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyGreaterThan(String value) { - addCriterion("`key` >", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyGreaterThanOrEqualTo(String value) { - addCriterion("`key` >=", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyLessThan(String value) { - addCriterion("`key` <", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyLessThanOrEqualTo(String value) { - addCriterion("`key` <=", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyLike(String value) { - addCriterion("`key` like", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyNotLike(String value) { - addCriterion("`key` not like", value, "key"); - return (Criteria) this; - } - - public Criteria andKeyIn(List values) { - addCriterion("`key` in", values, "key"); - return (Criteria) this; - } - - public Criteria andKeyNotIn(List values) { - addCriterion("`key` not in", values, "key"); - return (Criteria) this; - } - - public Criteria andKeyBetween(String value1, String value2) { - addCriterion("`key` between", value1, value2, "key"); - return (Criteria) this; - } - - public Criteria andKeyNotBetween(String value1, String value2) { - addCriterion("`key` not between", value1, value2, "key"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Long value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Long value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Long value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Long value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Long value1, Long value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andCreateUserIdIsNull() { - addCriterion("create_user_id is null"); - return (Criteria) this; - } - - public Criteria andCreateUserIdIsNotNull() { - addCriterion("create_user_id is not null"); - return (Criteria) this; - } - - public Criteria andCreateUserIdEqualTo(String value) { - addCriterion("create_user_id =", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotEqualTo(String value) { - addCriterion("create_user_id <>", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdGreaterThan(String value) { - addCriterion("create_user_id >", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdGreaterThanOrEqualTo(String value) { - addCriterion("create_user_id >=", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdLessThan(String value) { - addCriterion("create_user_id <", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdLessThanOrEqualTo(String value) { - addCriterion("create_user_id <=", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdLike(String value) { - addCriterion("create_user_id like", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotLike(String value) { - addCriterion("create_user_id not like", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdIn(List values) { - addCriterion("create_user_id in", values, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotIn(List values) { - addCriterion("create_user_id not in", values, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdBetween(String value1, String value2) { - addCriterion("create_user_id between", value1, value2, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotBetween(String value1, String value2) { - addCriterion("create_user_id not between", value1, value2, "createUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdIsNull() { - addCriterion("update_user_id is null"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdIsNotNull() { - addCriterion("update_user_id is not null"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdEqualTo(String value) { - addCriterion("update_user_id =", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotEqualTo(String value) { - addCriterion("update_user_id <>", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdGreaterThan(String value) { - addCriterion("update_user_id >", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdGreaterThanOrEqualTo(String value) { - addCriterion("update_user_id >=", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdLessThan(String value) { - addCriterion("update_user_id <", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdLessThanOrEqualTo(String value) { - addCriterion("update_user_id <=", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdLike(String value) { - addCriterion("update_user_id like", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotLike(String value) { - addCriterion("update_user_id not like", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdIn(List values) { - addCriterion("update_user_id in", values, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotIn(List values) { - addCriterion("update_user_id not in", values, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdBetween(String value1, String value2) { - addCriterion("update_user_id between", value1, value2, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotBetween(String value1, String value2) { - addCriterion("update_user_id not between", value1, value2, "updateUserId"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.java deleted file mode 100644 index 6c7dfb81e6..0000000000 --- a/backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.metersphere.base.mapper; - -import io.metersphere.base.domain.ApiEnvironmentRunningParam; -import io.metersphere.base.domain.ApiEnvironmentRunningParamExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface ApiEnvironmentRunningParamMapper { - long countByExample(ApiEnvironmentRunningParamExample example); - - int deleteByExample(ApiEnvironmentRunningParamExample example); - - int deleteByPrimaryKey(String id); - - int insert(ApiEnvironmentRunningParam record); - - int insertSelective(ApiEnvironmentRunningParam record); - - List selectByExampleWithBLOBs(ApiEnvironmentRunningParamExample example); - - List selectByExample(ApiEnvironmentRunningParamExample example); - - ApiEnvironmentRunningParam selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") ApiEnvironmentRunningParam record, @Param("example") ApiEnvironmentRunningParamExample example); - - int updateByExampleWithBLOBs(@Param("record") ApiEnvironmentRunningParam record, @Param("example") ApiEnvironmentRunningParamExample example); - - int updateByExample(@Param("record") ApiEnvironmentRunningParam record, @Param("example") ApiEnvironmentRunningParamExample example); - - int updateByPrimaryKeySelective(ApiEnvironmentRunningParam record); - - int updateByPrimaryKeyWithBLOBs(ApiEnvironmentRunningParam record); - - int updateByPrimaryKey(ApiEnvironmentRunningParam record); -} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.xml deleted file mode 100644 index a482234180..0000000000 --- a/backend/src/main/java/io/metersphere/base/mapper/ApiEnvironmentRunningParamMapper.xml +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, api_enviroment_id, `key`, create_time, update_time, create_user_id, update_user_id - - - `value` - - - - - - delete from api_environment_running_param - where id = #{id,jdbcType=VARCHAR} - - - delete from api_environment_running_param - - - - - - insert into api_environment_running_param (id, api_enviroment_id, `key`, - create_time, update_time, create_user_id, - update_user_id, `value`) - values (#{id,jdbcType=VARCHAR}, #{apiEnviromentId,jdbcType=VARCHAR}, #{key,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{createUserId,jdbcType=VARCHAR}, - #{updateUserId,jdbcType=VARCHAR}, #{value,jdbcType=LONGVARCHAR}) - - - insert into api_environment_running_param - - - id, - - - api_enviroment_id, - - - `key`, - - - create_time, - - - update_time, - - - create_user_id, - - - update_user_id, - - - `value`, - - - - - #{id,jdbcType=VARCHAR}, - - - #{apiEnviromentId,jdbcType=VARCHAR}, - - - #{key,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=BIGINT}, - - - #{updateTime,jdbcType=BIGINT}, - - - #{createUserId,jdbcType=VARCHAR}, - - - #{updateUserId,jdbcType=VARCHAR}, - - - #{value,jdbcType=LONGVARCHAR}, - - - - - - update api_environment_running_param - - - id = #{record.id,jdbcType=VARCHAR}, - - - api_enviroment_id = #{record.apiEnviromentId,jdbcType=VARCHAR}, - - - `key` = #{record.key,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=BIGINT}, - - - update_time = #{record.updateTime,jdbcType=BIGINT}, - - - create_user_id = #{record.createUserId,jdbcType=VARCHAR}, - - - update_user_id = #{record.updateUserId,jdbcType=VARCHAR}, - - - `value` = #{record.value,jdbcType=LONGVARCHAR}, - - - - - - - - update api_environment_running_param - set id = #{record.id,jdbcType=VARCHAR}, - api_enviroment_id = #{record.apiEnviromentId,jdbcType=VARCHAR}, - `key` = #{record.key,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, - create_user_id = #{record.createUserId,jdbcType=VARCHAR}, - update_user_id = #{record.updateUserId,jdbcType=VARCHAR}, - `value` = #{record.value,jdbcType=LONGVARCHAR} - - - - - - update api_environment_running_param - set id = #{record.id,jdbcType=VARCHAR}, - api_enviroment_id = #{record.apiEnviromentId,jdbcType=VARCHAR}, - `key` = #{record.key,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, - create_user_id = #{record.createUserId,jdbcType=VARCHAR}, - update_user_id = #{record.updateUserId,jdbcType=VARCHAR} - - - - - - update api_environment_running_param - - - api_enviroment_id = #{apiEnviromentId,jdbcType=VARCHAR}, - - - `key` = #{key,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=BIGINT}, - - - update_time = #{updateTime,jdbcType=BIGINT}, - - - create_user_id = #{createUserId,jdbcType=VARCHAR}, - - - update_user_id = #{updateUserId,jdbcType=VARCHAR}, - - - `value` = #{value,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update api_environment_running_param - set api_enviroment_id = #{apiEnviromentId,jdbcType=VARCHAR}, - `key` = #{key,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, - create_user_id = #{createUserId,jdbcType=VARCHAR}, - update_user_id = #{updateUserId,jdbcType=VARCHAR}, - `value` = #{value,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=VARCHAR} - - - update api_environment_running_param - set api_enviroment_id = #{apiEnviromentId,jdbcType=VARCHAR}, - `key` = #{key,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, - create_user_id = #{createUserId,jdbcType=VARCHAR}, - update_user_id = #{updateUserId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/backend/src/main/resources/db/migration/V83__v1.10_release.sql b/backend/src/main/resources/db/migration/V83__v1.10_release.sql index d5a43412df..e34a4aa14c 100644 --- a/backend/src/main/resources/db/migration/V83__v1.10_release.sql +++ b/backend/src/main/resources/db/migration/V83__v1.10_release.sql @@ -13,24 +13,6 @@ SET load_test_report.project_id = load_test.project_id; UPDATE load_test_report JOIN load_test ON load_test.id = load_test_report.test_id SET load_test_report.test_name = load_test.name; --- api_environment_running_param -CREATE TABLE IF NOT EXISTS api_environment_running_param ( - `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `api_enviroment_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, - `create_time` bigint(13) NULL DEFAULT NULL, - `update_time` bigint(13) NULL DEFAULT NULL, - `create_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `update_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE, - INDEX `api_enviroment_id` (`api_enviroment_id`) USING BTREE, - INDEX `key_api_enviroment_id` (`api_enviroment_id`, `key`) USING BTREE -) ENGINE = InnoDB - CHARACTER SET = utf8mb4 - COLLATE = utf8mb4_general_ci - ROW_FORMAT = Dynamic; - -- schedule alter table schedule add config VARCHAR(500) null; diff --git a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue index 0d5d9340a1..9e54076134 100644 --- a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue +++ b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue @@ -49,22 +49,10 @@ title: this.$t('api_test.request.processor.code_template_set_global_variable'), value: 'props.put("variable_name", "variable_value")', }, - { - title: this.$t('api_test.request.processor.param_environment_get_global_variable'), - value: 'io.metersphere.api.jmeter.RunningParam.getParam(${__metersphere_evn_id},"key")', - }, { title: this.$t('api_test.request.processor.param_environment_set_global_variable'), value: 'io.metersphere.api.jmeter.RunningParam.setParam(${__metersphere_evn_id},"key","value")', }, - { - title: this.$t('api_test.request.processor.param_environment_delete_global_variable'), - value: 'io.metersphere.api.jmeter.RunningParam.deleteParam(${__metersphere_evn_id},"key")', - }, - { - title: this.$t('api_test.request.processor.param_environment_show_global_variable'), - value: 'io.metersphere.api.jmeter.RunningParam.showParams(${__metersphere_evn_id})', - }, { title: this.$t('api_test.request.processor.code_add_report_length'), value: 'String report = ctx.getCurrentSampler().getRequestData();\n' +