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

refactor: "\n" -> StringUtils.LF

This commit is contained in:
liqiang-fit2cloud 2022-10-17 15:02:54 +08:00
parent 97922fba73
commit 259b4ab918
31 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
View File

@ -644,7 +644,7 @@ public class ElementUtil {
if (arguments != null) { if (arguments != null) {
for (int i = 0; i < arguments.getArguments().size(); ++i) { for (int i = 0; i < arguments.getArguments().size(); ++i) {
String argValue = arguments.getArgument(i).getValue(); String argValue = arguments.getArgument(i).getValue();
script.append("vars.put(\"" + arguments.getArgument(i).getName() + "\",\"" + argValue + "\");").append("\n"); script.append("vars.put(\"" + arguments.getArgument(i).getName() + "\",\"" + argValue + "\");").append(StringUtils.LF);
} }
processor.setProperty("script", script.toString()); processor.setProperty("script", script.toString());
} }

2
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
View File

@ -195,7 +195,7 @@ public class MsLoopController extends MsTestElement {
} }
private String script() { private String script() {
String script = "\n" + "import java.util.*;\n" + "import java.text.SimpleDateFormat;\n" + "import org.apache.jmeter.threads.JMeterContextService;\n" + "\n" + "// 循环控制器超时后结束循环\n" + "try{\n" + "\tString ms_current_timer = vars.get(\"" + ms_current_timer + "\");\n" + "\tlong _nowTime = System.currentTimeMillis(); \n" + "\tif(ms_current_timer == null ){\n" + "\t\tvars.put(\"" + ms_current_timer + "\",_nowTime.toString());\n" + "\t}\n" + "\tlong time = Long.parseLong(vars.get(\"" + ms_current_timer + "\"));\n" + "\t if((_nowTime - time) > " + this.whileController.getTimeout() + " ){\n" + "\t \tvars.put(\"" + ms_current_timer + "\", \"stop\");\n" + "\t \tlog.info( \"结束循环\");\n" + "\t }\n" + "}catch (Exception e){\n" + "\tlog.info( e.getMessage());\n" + "\tvars.put(\"" + ms_current_timer + "\", \"stop\");\n" + "}\n"; String script = StringUtils.LF + "import java.util.*;\n" + "import java.text.SimpleDateFormat;\n" + "import org.apache.jmeter.threads.JMeterContextService;\n" + "\n" + "// 循环控制器超时后结束循环\n" + "try{\n" + "\tString ms_current_timer = vars.get(\"" + ms_current_timer + "\");\n" + "\tlong _nowTime = System.currentTimeMillis(); \n" + "\tif(ms_current_timer == null ){\n" + "\t\tvars.put(\"" + ms_current_timer + "\",_nowTime.toString());\n" + "\t}\n" + "\tlong time = Long.parseLong(vars.get(\"" + ms_current_timer + "\"));\n" + "\t if((_nowTime - time) > " + this.whileController.getTimeout() + " ){\n" + "\t \tvars.put(\"" + ms_current_timer + "\", \"stop\");\n" + "\t \tlog.info( \"结束循环\");\n" + "\t }\n" + "}catch (Exception e){\n" + "\tlog.info( e.getMessage());\n" + "\tvars.put(\"" + ms_current_timer + "\", \"stop\");\n" + "}\n";
return script; return script;
} }

2
api-test/backend/src/main/java/io/metersphere/api/exec/engine/EngineSourceParserFactory.java
View File

@ -47,7 +47,7 @@ public class EngineSourceParserFactory {
// 删除空白的行 // 删除空白的行
List<Node> nodes = document.selectNodes("//text()[normalize-space(.)='']"); List<Node> nodes = document.selectNodes("//text()[normalize-space(.)='']");
nodes.forEach(node -> { nodes.forEach(node -> {
if (node.getText().contains("\n")) { if (node.getText().contains(StringUtils.LF)) {
node.setText(""); node.setText("");
} }
}); });

4
api-test/backend/src/main/java/io/metersphere/api/exec/engine/KubernetesTestEngine.java
View File

@ -51,8 +51,8 @@ public class KubernetesTestEngine extends AbstractEngine {
Pod pod = KubernetesApiExec.getExecPod(clientCredential, client); Pod pod = KubernetesApiExec.getExecPod(clientCredential, client);
StringBuffer logMsg = new StringBuffer("当前报告：【" + runRequest.getReportId() + "】资源：【" + runRequest.getTestId() + "】") StringBuffer logMsg = new StringBuffer("当前报告：【" + runRequest.getReportId() + "】资源：【" + runRequest.getTestId() + "】")
.append("\n").append("namespace：").append(clientCredential.getNamespace()) .append(StringUtils.LF).append("namespace：").append(clientCredential.getNamespace())
.append("\n").append("Pod信息：【 ") .append(StringUtils.LF).append("Pod信息：【 ")
.append(JSON.toJSONString(pod.getMetadata())).append(" 】"); .append(JSON.toJSONString(pod.getMetadata())).append(" 】");
LoggerUtil.info(logMsg); LoggerUtil.info(logMsg);
// 拼接CURL执行命令 // 拼接CURL执行命令

20
api-test/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
View File

@ -83,15 +83,15 @@ public class ExecThreadPoolExecutor {
public void outApiThreadPoolExecutorLogger(String message) { public void outApiThreadPoolExecutorLogger(String message) {
ArrayBlockingQueue queue = (ArrayBlockingQueue) threadPool.getQueue(); ArrayBlockingQueue queue = (ArrayBlockingQueue) threadPool.getQueue();
StringBuffer buffer = new StringBuffer("\n" + message); StringBuffer buffer = new StringBuffer(org.apache.commons.lang3.StringUtils.LF + message);
buffer.append("\n").append("线程池详情：").append("\n"); buffer.append("\n").append("线程池详情：").append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 核心线程数：" + threadPool.getCorePoolSize()).append("\n"); buffer.append(" 核心线程数：" + threadPool.getCorePoolSize()).append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 活动线程数：" + threadPool.getActiveCount()).append(" (略有波动非精确数据)").append("\n"); buffer.append(" 活动线程数：" + threadPool.getActiveCount()).append(" (略有波动非精确数据)").append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 最大线程数：" + threadPool.getMaximumPoolSize()).append("\n"); buffer.append(" 最大线程数：" + threadPool.getMaximumPoolSize()).append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 线程池活跃度：" + divide(threadPool.getActiveCount(), threadPool.getMaximumPoolSize())).append("\n"); buffer.append(" 线程池活跃度：" + divide(threadPool.getActiveCount(), threadPool.getMaximumPoolSize())).append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 最大队列数：" + (queue.size() + queue.remainingCapacity())).append("\n"); buffer.append(" 最大队列数：" + (queue.size() + queue.remainingCapacity())).append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 当前排队线程数：" + (msRejectedExecutionHandler.getBufferQueue().size() + queue.size())).append("\n"); buffer.append(" 当前排队线程数：" + (msRejectedExecutionHandler.getBufferQueue().size() + queue.size())).append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 执行中队列大小：" + PoolExecBlockingQueueUtil.queue.size()).append("\n"); buffer.append(" 执行中队列大小：" + PoolExecBlockingQueueUtil.queue.size()).append(org.apache.commons.lang3.StringUtils.LF);
buffer.append(" 队列使用度：" + divide(queue.size(), queue.size() + queue.remainingCapacity())); buffer.append(" 队列使用度：" + divide(queue.size(), queue.size() + queue.remainingCapacity()));
LoggerUtil.info(buffer.toString()); LoggerUtil.info(buffer.toString());
@ -172,7 +172,7 @@ public class ExecThreadPoolExecutor {
workerQueue.forEach(item -> { workerQueue.forEach(item -> {
ExecTask task = (ExecTask) item; ExecTask task = (ExecTask) item;
if (task.getRequest() != null) { if (task.getRequest() != null) {
buffer.append("等待队列报告：【 " + task.getRequest().getReportId() + "】资源：【 " + task.getRequest().getTestId() + "】").append("\n"); buffer.append("等待队列报告：【 " + task.getRequest().getReportId() + "】资源：【 " + task.getRequest().getTestId() + "】").append(org.apache.commons.lang3.StringUtils.LF);
} }
}); });

2
api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiEnvironmentRunningParamService.java
View File

@ -108,7 +108,7 @@ public class ApiEnvironmentRunningParamService {
} }
public void parseEvn(String envStr) { public void parseEvn(String envStr) {
String[] envStringArr = envStr.split("\n"); String[] envStringArr = envStr.split(StringUtils.LF);
Map<String, Map<String, String>> envVarsMap = new HashMap<>(); Map<String, Map<String, String>> envVarsMap = new HashMap<>();
for (String env : envStringArr) { for (String env : envStringArr) {
if (StringUtils.contains(env, "=")) { if (StringUtils.contains(env, "=")) {

8
api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterLoggerAppender.java
View File

@ -17,14 +17,14 @@ public class JMeterLoggerAppender extends UnsynchronizedAppenderBase<ILoggingEve
message.append(DateUtils.getTimeStr(event.getTimeStamp())).append(StringUtils.SPACE) message.append(DateUtils.getTimeStr(event.getTimeStamp())).append(StringUtils.SPACE)
.append(event.getLevel()).append(StringUtils.SPACE) .append(event.getLevel()).append(StringUtils.SPACE)
.append(event.getThreadName()).append(StringUtils.SPACE) .append(event.getThreadName()).append(StringUtils.SPACE)
.append(event.getFormattedMessage()).append("\n"); .append(event.getFormattedMessage()).append(StringUtils.LF);
if (event.getThrowableProxy() != null) { if (event.getThrowableProxy() != null) {
message.append(event.getThrowableProxy().getMessage()).append("\n"); message.append(event.getThrowableProxy().getMessage()).append(StringUtils.LF);
message.append(event.getThrowableProxy().getClassName()).append("\n"); message.append(event.getThrowableProxy().getClassName()).append(StringUtils.LF);
if (event.getThrowableProxy().getStackTraceElementProxyArray() != null) { if (event.getThrowableProxy().getStackTraceElementProxyArray() != null) {
for (StackTraceElementProxy stackTraceElementProxy : event.getThrowableProxy().getStackTraceElementProxyArray()) { for (StackTraceElementProxy stackTraceElementProxy : event.getThrowableProxy().getStackTraceElementProxyArray()) {
message.append(" ").append(stackTraceElementProxy.getSTEAsString()).append("\n"); message.append(" ").append(stackTraceElementProxy.getSTEAsString()).append(StringUtils.LF);
} }
} }
} }

2
api-test/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
View File

@ -187,7 +187,7 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
if (variables != null && CollectionUtils.isNotEmpty(variables.entrySet())) { if (variables != null && CollectionUtils.isNotEmpty(variables.entrySet())) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (Map.Entry<String, Object> entry : variables.entrySet()) { for (Map.Entry<String, Object> entry : variables.entrySet()) {
builder.append(entry.getKey()).append("：").append(entry.getValue()).append("\n"); builder.append(entry.getKey()).append("：").append(entry.getValue()).append(StringUtils.LF);
} }
if (StringUtils.isNotEmpty(builder)) { if (StringUtils.isNotEmpty(builder)) {
result.setExtVars(builder.toString()); result.setExtVars(builder.toString());

15
api-test/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
View File

@ -6,6 +6,7 @@ import io.metersphere.commons.utils.NamedThreadFactory;
import io.metersphere.service.ApiExecutionQueueService; import io.metersphere.service.ApiExecutionQueueService;
import io.metersphere.service.TestResultService; import io.metersphere.service.TestResultService;
import io.metersphere.utils.LoggerUtil; import io.metersphere.utils.LoggerUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.kafka.annotation.KafkaListener; import org.springframework.kafka.annotation.KafkaListener;
@ -65,19 +66,19 @@ public class MsKafkaListener {
public void outKafkaPoolLogger() { public void outKafkaPoolLogger() {
StringBuffer buffer = new StringBuffer() StringBuffer buffer = new StringBuffer()
.append("\n") .append(StringUtils.LF)
.append("KAFKA Consume 线程池详情：") .append("KAFKA Consume 线程池详情：")
.append("\n") .append(StringUtils.LF)
.append(" KAFKA Consume 核心线程数：" + threadPool.getCorePoolSize()) .append(" KAFKA Consume 核心线程数：" + threadPool.getCorePoolSize())
.append("\n") .append(StringUtils.LF)
.append(" KAFKA Consume 活动线程数：" + threadPool.getActiveCount()) .append(" KAFKA Consume 活动线程数：" + threadPool.getActiveCount())
.append("\n") .append(StringUtils.LF)
.append(" KAFKA Consume 最大线程数：" + threadPool.getMaximumPoolSize()) .append(" KAFKA Consume 最大线程数：" + threadPool.getMaximumPoolSize())
.append("\n") .append(StringUtils.LF)
.append(" KAFKA Consume 最大队列数：" + (threadPool.getQueue().size() + threadPool.getQueue().remainingCapacity())) .append(" KAFKA Consume 最大队列数：" + (threadPool.getQueue().size() + threadPool.getQueue().remainingCapacity()))
.append("\n") .append(StringUtils.LF)
.append(" KAFKA Consume 当前排队线程数：" + (threadPool.getQueue().size())) .append(" KAFKA Consume 当前排队线程数：" + (threadPool.getQueue().size()))
.append("\n"); .append(StringUtils.LF);
LoggerUtil.info(buffer.toString()); LoggerUtil.info(buffer.toString());
} }

2
api-test/backend/src/main/java/io/metersphere/api/parse/HarScenarioAbstractParser.java
View File

@ -163,7 +163,7 @@ public abstract class HarScenarioAbstractParser<T> extends ApiImportAbstractPars
if (CollectionUtils.isNotEmpty(exec)) { if (CollectionUtils.isNotEmpty(exec)) {
exec.forEach(col -> { exec.forEach(col -> {
if (StringUtils.isNotEmpty(col)) { if (StringUtils.isNotEmpty(col)) {
scriptStr.append(col + "\n"); scriptStr.append(col + StringUtils.LF);
} }
}); });
} }

8
api-test/backend/src/main/java/io/metersphere/commons/utils/JmeterDocumentParser.java
View File

@ -255,7 +255,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
if (content == null) { if (content == null) {
return; return;
} }
StringTokenizer tokenizer = new StringTokenizer(new String(content), "\n"); StringTokenizer tokenizer = new StringTokenizer(new String(content), StringUtils.LF);
if (!tokenizer.hasMoreTokens()) { if (!tokenizer.hasMoreTokens()) {
return; return;
} }
@ -268,7 +268,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
boolean csvHasHeader = ((JSONObject) (config)).getBoolean("csvHasHeader"); boolean csvHasHeader = ((JSONObject) (config)).getBoolean("csvHasHeader");
if (csvHasHeader) { if (csvHasHeader) {
String header = tokenizer.nextToken(); String header = tokenizer.nextToken();
csv.append(header).append("\n"); csv.append(header).append(StringUtils.LF);
} }
int count = tokenizer.countTokens(); int count = tokenizer.countTokens();
@ -289,7 +289,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
while (tokenizer.hasMoreTokens()) { while (tokenizer.hasMoreTokens()) {
if (current == 0) { // 节点一个都没有分到，把所有的数据都给这个节点（极端情况） if (current == 0) { // 节点一个都没有分到，把所有的数据都给这个节点（极端情况）
String line = tokenizer.nextToken(); String line = tokenizer.nextToken();
csv.append(line).append("\n"); csv.append(line).append(StringUtils.LF);
} else { } else {
if (index <= offset) { if (index <= offset) {
tokenizer.nextToken(); tokenizer.nextToken();
@ -300,7 +300,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
break; break;
} }
String line = tokenizer.nextToken(); String line = tokenizer.nextToken();
csv.append(line).append("\n"); csv.append(line).append(StringUtils.LF);
} }
index++; index++;
} }

8
api-test/backend/src/main/java/io/metersphere/listener/ApiAppStartListener.java
View File

@ -77,13 +77,13 @@ public class ApiAppStartListener implements ApplicationRunner {
LogUtil.info("starting quartz"); LogUtil.info("starting quartz");
StringBuffer buffer = new StringBuffer("定时任务相关设置："); StringBuffer buffer = new StringBuffer("定时任务相关设置：");
buffer.append("quartz.acquireTriggersWithinLock :") buffer.append("quartz.acquireTriggersWithinLock :")
.append(acquireTriggersWithinLock).append("\n") .append(acquireTriggersWithinLock).append(StringUtils.LF)
.append("quartz.enabled ") .append("quartz.enabled ")
.append(quartzEnable).append("\n") .append(quartzEnable).append(StringUtils.LF)
.append("quartz.scheduler-name ") .append("quartz.scheduler-name ")
.append(quartzScheduleName).append("\n") .append(quartzScheduleName).append(StringUtils.LF)
.append("quartz.thread-count ") .append("quartz.thread-count ")
.append(quartzThreadCount).append("\n"); .append(quartzThreadCount).append(StringUtils.LF);
LogUtil.info(buffer.toString()); LogUtil.info(buffer.toString());
scheduleService.startEnableSchedules(ScheduleGroup.API_SCENARIO_TEST); scheduleService.startEnableSchedules(ScheduleGroup.API_SCENARIO_TEST);

2
api-test/backend/src/main/java/io/metersphere/service/RemakeReportService.java
View File

@ -184,7 +184,7 @@ public class RemakeReportService {
// 全局并发队列 // 全局并发队列
PoolExecBlockingQueueUtil.offer(dto.getReportId()); PoolExecBlockingQueueUtil.offer(dto.getReportId());
String consoleMsg = FixedCapacityUtil.getJmeterLogger(dto.getReportId(), true); String consoleMsg = FixedCapacityUtil.getJmeterLogger(dto.getReportId(), true);
dto.setConsole(consoleMsg + "\n" + errorMsg); dto.setConsole(consoleMsg + StringUtils.LF + errorMsg);
// 整体执行结束更新资源状态 // 整体执行结束更新资源状态
CommonBeanFactory.getBean(TestResultService.class).testEnded(dto); CommonBeanFactory.getBean(TestResultService.class).testEnded(dto);

3
framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/EnumPropertyUtil.java
View File

@ -4,6 +4,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.metersphere.commons.json.BasicConstant; import io.metersphere.commons.json.BasicConstant;
import org.apache.commons.lang3.StringUtils;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -22,7 +23,7 @@ public class EnumPropertyUtil {
jsonStr = object.get(BasicConstant.ENUM).getAsString(); jsonStr = object.get(BasicConstant.ENUM).getAsString();
} }
if (jsonStr != null && list.isEmpty()) { if (jsonStr != null && list.isEmpty()) {
String[] arrays = jsonStr.split("\n"); String[] arrays = jsonStr.split(StringUtils.LF);
for (String str : arrays) { for (String str : arrays) {
list.add(str); list.add(str);
} }

5
framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/LogUtil.java
View File

@ -1,5 +1,6 @@
package io.metersphere.commons.utils; package io.metersphere.commons.utils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -260,9 +261,9 @@ public class LogUtil {
StackTraceElement[] stackElements = e.getStackTrace(); StackTraceElement[] stackElements = e.getStackTrace();
for (StackTraceElement stackTraceElement : stackElements) { for (StackTraceElement stackTraceElement : stackElements) {
sb.append(stackTraceElement.toString()); sb.append(stackTraceElement.toString());
sb.append("\n"); sb.append(StringUtils.LF);
} }
sb.append("\n"); sb.append(StringUtils.LF);
return sb.toString(); return sb.toString();
} }
} }

3
framework/sdk-parent/sdk/src/main/java/io/metersphere/log/utils/diff/json/Leaf.java
View File

@ -4,6 +4,7 @@ import io.metersphere.log.utils.diff.json.jsonwrap.JzonArray;
import io.metersphere.log.utils.diff.json.jsonwrap.JzonElement; import io.metersphere.log.utils.diff.json.jsonwrap.JzonElement;
import io.metersphere.log.utils.diff.json.jsonwrap.JzonObject; import io.metersphere.log.utils.diff.json.jsonwrap.JzonObject;
import io.metersphere.log.utils.diff.json.jsonwrap.Wrapper; import io.metersphere.log.utils.diff.json.jsonwrap.Wrapper;
import org.apache.commons.lang3.StringUtils;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
@ -378,7 +379,7 @@ class Leaf implements Comparable<Leaf> {
bld.append("_ORPHAN"); bld.append("_ORPHAN");
} }
bld.append(">"); bld.append(">");
bld.append("\n"); bld.append(StringUtils.LF);
return bld.toString(); return bld.toString();

2
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/BaseUserService.java
View File

@ -561,7 +561,7 @@ public class BaseUserService {
List<String> names = users.stream().map(User::getName).collect(Collectors.toList()); List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
StringBuilder nameBuilder = new StringBuilder(); StringBuilder nameBuilder = new StringBuilder();
nameBuilder.append(String.join(",", names)).append("\n"); nameBuilder.append(String.join(",", names)).append(StringUtils.LF);
for (String userId : ids) { for (String userId : ids) {
UserGroupExample userGroupExample = new UserGroupExample(); UserGroupExample userGroupExample = new UserGroupExample();
userGroupExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(id); userGroupExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(id);

6
performance-test/backend/src/main/java/io/metersphere/engine/EngineFactory.java
View File

@ -221,7 +221,7 @@ public class EngineFactory {
if (!(Boolean) prop.get("enable")) { if (!(Boolean) prop.get("enable")) {
continue; continue;
} }
dns.append(prop.get("ip")).append(StringUtils.SPACE).append(prop.get("domain")).append("\n"); dns.append(prop.get("ip")).append(StringUtils.SPACE).append(prop.get("domain")).append(StringUtils.LF);
} }
} }
} }
@ -240,7 +240,7 @@ public class EngineFactory {
if (!(Boolean) prop.get("enable")) { if (!(Boolean) prop.get("enable")) {
continue; continue;
} }
props.append(prop.get("name")).append("=").append(prop.get("value")).append("\n"); props.append(prop.get("name")).append("=").append(prop.get("value")).append(StringUtils.LF);
} }
} }
} }
@ -259,7 +259,7 @@ public class EngineFactory {
if (!(Boolean) prop.get("enable")) { if (!(Boolean) prop.get("enable")) {
continue; continue;
} }
props.append(prop.get("name")).append("=").append(prop.get("value")).append("\n"); props.append(prop.get("name")).append("=").append(prop.get("value")).append(StringUtils.LF);
} }
} }
} }

2
performance-test/backend/src/main/java/io/metersphere/parse/EngineSourceParserFactory.java
View File

@ -60,7 +60,7 @@ public class EngineSourceParserFactory {
// 删除空白的行 // 删除空白的行
List<Node> nodes = document.selectNodes("//text()[normalize-space(.)='']"); List<Node> nodes = document.selectNodes("//text()[normalize-space(.)='']");
nodes.forEach(node -> { nodes.forEach(node -> {
if (node.getText().contains("\n")) { if (node.getText().contains(StringUtils.LF)) {
node.setText(StringUtils.EMPTY); node.setText(StringUtils.EMPTY);
} }
}); });

8
performance-test/backend/src/main/java/io/metersphere/parse/xml/reader/JmeterDocumentParser.java
View File

@ -253,7 +253,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
if (content == null) { if (content == null) {
return; return;
} }
StringTokenizer tokenizer = new StringTokenizer(new String(content), "\n"); StringTokenizer tokenizer = new StringTokenizer(new String(content), StringUtils.LF);
if (!tokenizer.hasMoreTokens()) { if (!tokenizer.hasMoreTokens()) {
return; return;
} }
@ -266,7 +266,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
boolean csvHasHeader = (Boolean) ((Map) (config)).get("csvHasHeader"); boolean csvHasHeader = (Boolean) ((Map) (config)).get("csvHasHeader");
if (csvHasHeader) { if (csvHasHeader) {
String header = tokenizer.nextToken(); String header = tokenizer.nextToken();
csv.append(header).append("\n"); csv.append(header).append(StringUtils.LF);
} }
int count = tokenizer.countTokens(); int count = tokenizer.countTokens();
@ -287,7 +287,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
while (tokenizer.hasMoreTokens()) { while (tokenizer.hasMoreTokens()) {
if (current == 0) { // 节点一个都没有分到，把所有的数据都给这个节点（极端情况） if (current == 0) { // 节点一个都没有分到，把所有的数据都给这个节点（极端情况）
String line = tokenizer.nextToken(); String line = tokenizer.nextToken();
csv.append(line).append("\n"); csv.append(line).append(StringUtils.LF);
} else { } else {
if (index <= offset) { if (index <= offset) {
tokenizer.nextToken(); tokenizer.nextToken();
@ -298,7 +298,7 @@ public class JmeterDocumentParser implements EngineSourceParser {
break; break;
} }
String line = tokenizer.nextToken(); String line = tokenizer.nextToken();
csv.append(line).append("\n"); csv.append(line).append(StringUtils.LF);
} }
index++; index++;
} }

4
performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
View File

@ -453,7 +453,7 @@ public class PerformanceTestService {
reportDetail.setPart(1L); reportDetail.setPart(1L);
loadTestReportDetailMapper.insertSelective(reportDetail); loadTestReportDetailMapper.insertSelective(reportDetail);
// append \n // append \n
extLoadTestReportDetailMapper.appendLine(testReport.getId(), "\n"); extLoadTestReportDetailMapper.appendLine(testReport.getId(), StringUtils.LF);
// 保存一个 reportStatus // 保存一个 reportStatus
LoadTestReportResult reportResult = new LoadTestReportResult(); LoadTestReportResult reportResult = new LoadTestReportResult();
reportResult.setId(UUID.randomUUID().toString()); reportResult.setId(UUID.randomUUID().toString());
@ -1008,7 +1008,7 @@ public class PerformanceTestService {
example.createCriteria().andIdIn(testIds); example.createCriteria().andIdIn(testIds);
List<LoadTest> loadTests = loadTestMapper.selectByExample(example); List<LoadTest> loadTests = loadTestMapper.selectByExample(example);
errorMessage += Translator.get("load_test") + ": " + StringUtils.join(loadTests.stream().map(LoadTest::getName).toArray(), ","); errorMessage += Translator.get("load_test") + ": " + StringUtils.join(loadTests.stream().map(LoadTest::getName).toArray(), ",");
errorMessage += "\n"; errorMessage += StringUtils.LF;
} }
if (StringUtils.isNotBlank(errorMessage)) { if (StringUtils.isNotBlank(errorMessage)) {
MSException.throwException(errorMessage + Translator.get("project_file_in_use")); MSException.throwException(errorMessage + Translator.get("project_file_in_use"));

8
project-management/backend/src/main/java/io/metersphere/code/snippet/JMeterLoggerAppender.java
View File

@ -18,14 +18,14 @@ public class JMeterLoggerAppender extends UnsynchronizedAppenderBase<ILoggingEve
message.append(DateUtils.getTimeStr(event.getTimeStamp())).append(StringUtils.SPACE) message.append(DateUtils.getTimeStr(event.getTimeStamp())).append(StringUtils.SPACE)
.append(event.getLevel()).append(StringUtils.SPACE) .append(event.getLevel()).append(StringUtils.SPACE)
.append(event.getThreadName()).append(StringUtils.SPACE) .append(event.getThreadName()).append(StringUtils.SPACE)
.append(event.getFormattedMessage()).append("\n"); .append(event.getFormattedMessage()).append(StringUtils.LF);
if (event.getThrowableProxy() != null) { if (event.getThrowableProxy() != null) {
message.append(event.getThrowableProxy().getMessage()).append("\n"); message.append(event.getThrowableProxy().getMessage()).append(StringUtils.LF);
message.append(event.getThrowableProxy().getClassName()).append("\n"); message.append(event.getThrowableProxy().getClassName()).append(StringUtils.LF);
if (event.getThrowableProxy().getStackTraceElementProxyArray() != null) { if (event.getThrowableProxy().getStackTraceElementProxyArray() != null) {
for (StackTraceElementProxy stackTraceElementProxy : event.getThrowableProxy().getStackTraceElementProxyArray()) { for (StackTraceElementProxy stackTraceElementProxy : event.getThrowableProxy().getStackTraceElementProxyArray()) {
message.append(" ").append(stackTraceElementProxy.getSTEAsString()).append("\n"); message.append(" ").append(stackTraceElementProxy.getSTEAsString()).append(StringUtils.LF);
} }
} }
} }

2
project-management/backend/src/main/java/io/metersphere/code/snippet/listener/MsDebugListener.java
View File

@ -184,7 +184,7 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
if (variables != null && CollectionUtils.isNotEmpty(variables.entrySet())) { if (variables != null && CollectionUtils.isNotEmpty(variables.entrySet())) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (Map.Entry<String, Object> entry : variables.entrySet()) { for (Map.Entry<String, Object> entry : variables.entrySet()) {
builder.append(entry.getKey()).append("：").append(entry.getValue()).append("\n"); builder.append(entry.getKey()).append("：").append(entry.getValue()).append(StringUtils.LF);
} }
if (StringUtils.isNotEmpty(builder)) { if (StringUtils.isNotEmpty(builder)) {
result.setExtVars(builder.toString()); result.setExtVars(builder.toString());

2
report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/EnterpriseTestReportService.java
View File

@ -354,7 +354,7 @@ public class EnterpriseTestReportService {
for (EnterpriseReportContentStep step : stepList) { for (EnterpriseReportContentStep step : stepList) {
String title = "<div style=\"background-color: #783887;font-size: 16px;color: white;margin: 5px;width: 100%; line-height:30px\">\n" + String title = "<div style=\"background-color: #783887;font-size: 16px;color: white;margin: 5px;width: 100%; line-height:30px\">\n" +
"<span style=\"margin-left: 5px\">" + step.getName() + "\n" + "<span style=\"margin-left: 5px\">" + step.getName() + StringUtils.LF +
"</span>\n" + "</span>\n" +
"</div>"; "</div>";
returnReportContentBuffer.append(title); returnReportContentBuffer.append(title);

6
system-setting/backend/src/main/java/io/metersphere/excel/listener/UserDataListener.java
View File

@ -126,7 +126,7 @@ public class UserDataListener extends EasyExcelListener<UserExcelData> {
private String checkWorkSpace(String userRoleInExcel, String workspaceInfoInExcel) { private String checkWorkSpace(String userRoleInExcel, String workspaceInfoInExcel) {
String result = null; String result = null;
if (StringUtils.equalsIgnoreCase(Translator.get("options_yes"), userRoleInExcel)) { if (StringUtils.equalsIgnoreCase(Translator.get("options_yes"), userRoleInExcel)) {
String[] workspaceArr = workspaceInfoInExcel.split("\n"); String[] workspaceArr = workspaceInfoInExcel.split(StringUtils.LF);
for (String workspace : for (String workspace :
workspaceArr) { workspaceArr) {
if (!workspaceNameMap.containsKey(workspace)) { if (!workspaceNameMap.containsKey(workspace)) {
@ -151,7 +151,7 @@ public class UserDataListener extends EasyExcelListener<UserExcelData> {
private String checkProject(String userGroupInExcel, String projectInfoInExcel) { private String checkProject(String userGroupInExcel, String projectInfoInExcel) {
String result = null; String result = null;
if (StringUtils.equalsAnyIgnoreCase(Translator.get("options_yes"), userGroupInExcel)) { if (StringUtils.equalsAnyIgnoreCase(Translator.get("options_yes"), userGroupInExcel)) {
String[] projectNameArr = projectInfoInExcel.split("\n"); String[] projectNameArr = projectInfoInExcel.split(StringUtils.LF);
for (String projectName : projectNameArr) { for (String projectName : projectNameArr) {
if (!projectNameMap.containsKey(projectName)) { if (!projectNameMap.containsKey(projectName)) {
if (result == null) { if (result == null) {
@ -176,7 +176,7 @@ public class UserDataListener extends EasyExcelListener<UserExcelData> {
private List<String> getIdByExcelInfoAndIdDic(String userRoleInExcel, String nameStringInExce, Map<String, String> idDic) { private List<String> getIdByExcelInfoAndIdDic(String userRoleInExcel, String nameStringInExce, Map<String, String> idDic) {
List<String> resultList = new ArrayList<>(); List<String> resultList = new ArrayList<>();
if (StringUtils.equalsIgnoreCase(Translator.get("options_yes"), userRoleInExcel)) { if (StringUtils.equalsIgnoreCase(Translator.get("options_yes"), userRoleInExcel)) {
String[] nameArr = nameStringInExce.split("\n"); String[] nameArr = nameStringInExce.split(StringUtils.LF);
for (String name : nameArr) { for (String name : nameArr) {
if (idDic.containsKey(name)) { if (idDic.containsKey(name)) {
resultList.add(idDic.get(name)); resultList.add(idDic.get(name));

4
system-setting/backend/src/main/java/io/metersphere/service/UserService.java
View File

@ -950,7 +950,7 @@ public class UserService {
List<String> names = users.stream().map(User::getName).collect(Collectors.toList()); List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
StringBuilder nameBuilder = new StringBuilder(); StringBuilder nameBuilder = new StringBuilder();
nameBuilder.append(String.join(",", names)).append("\n"); nameBuilder.append(String.join(",", names)).append(StringUtils.LF);
for (String userId : ids) { for (String userId : ids) {
UserGroupExample userGroupExample = new UserGroupExample(); UserGroupExample userGroupExample = new UserGroupExample();
userGroupExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(id); userGroupExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(id);
@ -1019,7 +1019,7 @@ public class UserService {
List<User> users = userMapper.selectByExample(example); List<User> users = userMapper.selectByExample(example);
if (users != null) { if (users != null) {
List<String> names = users.stream().map(User::getName).collect(Collectors.toList()); List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
String roles = "\n" + "成员角色：\n" + this.getRoles(users.get(0).getId()); String roles = StringUtils.LF + "成员角色：\n" + this.getRoles(users.get(0).getId());
OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(userIdList), null, String.join(",", names) + roles, null, new LinkedList<>()); OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(userIdList), null, String.join(",", names) + roles, null, new LinkedList<>());
return JSON.toJSONString(details); return JSON.toJSONString(details);
} }

2
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -1311,7 +1311,7 @@ public class TestPlanService {
if (line.contains("\"#report\"")) { if (line.contains("\"#report\"")) {
line = line.replace("\"#report\"", new Gson().toJson(report)); line = line.replace("\"#report\"", new Gson().toJson(report));
} }
line += "\n"; line += StringUtils.LF;
byte[] lineBytes = line.getBytes(StandardCharsets.UTF_8); byte[] lineBytes = line.getBytes(StandardCharsets.UTF_8);
int start = 0; int start = 0;
while (start < lineBytes.length) { while (start < lineBytes.length) {

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

@ -2341,21 +2341,21 @@ public class TestCaseService {
List<ApiTestCase> testCases = relevanceApiCaseService.getApiCaseByIds(testCaseIds); List<ApiTestCase> testCases = relevanceApiCaseService.getApiCaseByIds(testCaseIds);
List<String> caseNames = testCases.stream().map(ApiTestCase::getName).collect(Collectors.toList()); List<String> caseNames = testCases.stream().map(ApiTestCase::getName).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(caseNames)) { if (CollectionUtils.isNotEmpty(caseNames)) {
nameBuilder.append("接口用例：").append("\n").append(caseNames).append("\n"); nameBuilder.append("接口用例：").append(StringUtils.LF).append(caseNames).append(StringUtils.LF);
} }
} }
if (CollectionUtils.isNotEmpty(performanceIds)) { if (CollectionUtils.isNotEmpty(performanceIds)) {
List<LoadTest> loadTests = relevanceLoadCaseService.getLoadCaseByIds(performanceIds); List<LoadTest> loadTests = relevanceLoadCaseService.getLoadCaseByIds(performanceIds);
List<String> caseNames = loadTests.stream().map(LoadTest::getName).collect(Collectors.toList()); List<String> caseNames = loadTests.stream().map(LoadTest::getName).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(caseNames)) { if (CollectionUtils.isNotEmpty(caseNames)) {
nameBuilder.append("性能用例：").append("\n").append(caseNames).append("\n"); nameBuilder.append("性能用例：").append(StringUtils.LF).append(caseNames).append(StringUtils.LF);
} }
} }
if (CollectionUtils.isNotEmpty(automationIds)) { if (CollectionUtils.isNotEmpty(automationIds)) {
List<ApiScenario> scenarios = relevanceApiCaseService.getScenarioCaseByIds(automationIds); List<ApiScenario> scenarios = relevanceApiCaseService.getScenarioCaseByIds(automationIds);
List<String> caseNames = scenarios.stream().map(ApiScenario::getName).collect(Collectors.toList()); List<String> caseNames = scenarios.stream().map(ApiScenario::getName).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(caseNames)) { if (CollectionUtils.isNotEmpty(caseNames)) {
nameBuilder.append("自动化用例：").append("\n").append(caseNames).append("\n"); nameBuilder.append("自动化用例：").append(StringUtils.LF).append(caseNames).append(StringUtils.LF);
} }
} }
} }
@ -2393,7 +2393,7 @@ public class TestCaseService {
if (CollectionUtils.isNotEmpty(dtos)) { if (CollectionUtils.isNotEmpty(dtos)) {
names = dtos.stream().map(TestCaseCommentDTO::getDescription).collect(Collectors.toList()); names = dtos.stream().map(TestCaseCommentDTO::getDescription).collect(Collectors.toList());
} }
DetailColumn detailColumn = new DetailColumn("评论", "comment", String.join("\n", names), null); DetailColumn detailColumn = new DetailColumn("评论", "comment", String.join(StringUtils.LF, names), null);
columns.add(detailColumn); columns.add(detailColumn);
OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(id), bloBs.getProjectId(), bloBs.getName(), bloBs.getCreateUser(), columns); OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(id), bloBs.getProjectId(), bloBs.getName(), bloBs.getCreateUser(), columns);
@ -2412,7 +2412,7 @@ public class TestCaseService {
List<TestCaseCommentDTO> dtos = testCaseCommentService.getCaseComments(id); List<TestCaseCommentDTO> dtos = testCaseCommentService.getCaseComments(id);
if (CollectionUtils.isNotEmpty(dtos)) { if (CollectionUtils.isNotEmpty(dtos)) {
List<String> names = dtos.stream().map(TestCaseCommentDTO::getDescription).collect(Collectors.toList()); List<String> names = dtos.stream().map(TestCaseCommentDTO::getDescription).collect(Collectors.toList());
DetailColumn detailColumn = new DetailColumn("评论", "comment", String.join("\n", names), null); DetailColumn detailColumn = new DetailColumn("评论", "comment", String.join(StringUtils.LF, names), null);
columns.add(detailColumn); columns.add(detailColumn);
} }
OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(testCaseWithBLOBs.getId()), testCaseWithBLOBs.getProjectId(), testCaseWithBLOBs.getName(), testCaseWithBLOBs.getCreateUser(), columns); OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(testCaseWithBLOBs.getId()), testCaseWithBLOBs.getProjectId(), testCaseWithBLOBs.getName(), testCaseWithBLOBs.getCreateUser(), columns);

2
test-track/backend/src/main/java/io/metersphere/service/issue/platform/AbstractIssuePlatform.java
View File

@ -240,7 +240,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
document.outputSettings(new Document.OutputSettings().prettyPrint(false)); document.outputSettings(new Document.OutputSettings().prettyPrint(false));
document.select("br").append("\\n"); document.select("br").append("\\n");
document.select("p").prepend("\\n\\n"); document.select("p").prepend("\\n\\n");
desc = document.html().replaceAll("\\\\n", "\n"); desc = document.html().replaceAll("\\\\n", StringUtils.LF);
desc = Jsoup.clean(desc, "", Safelist.none(), new Document.OutputSettings().prettyPrint(false)); desc = Jsoup.clean(desc, "", Safelist.none(), new Document.OutputSettings().prettyPrint(false));
return desc.replace("&nbsp;", ""); return desc.replace("&nbsp;", "");
} }

2
test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java
View File

@ -158,7 +158,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
private String appendMoreImage(String description, Map<String, String> fileContentMap) { private String appendMoreImage(String description, Map<String, String> fileContentMap) {
for (String key: fileContentMap.keySet()) { for (String key: fileContentMap.keySet()) {
// 同步jira上传的附件 // 同步jira上传的附件
description += "\n" + fileContentMap.get(key); description += StringUtils.LF + fileContentMap.get(key);
} }
return description; return description;
} }

2
test-track/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
View File

@ -392,7 +392,7 @@ public class XmindCaseParser {
testCase.setPrerequisite(replace(item.getTitle(), PC_REGEX)); testCase.setPrerequisite(replace(item.getTitle(), PC_REGEX));
} else if (isAvailable(item.getTitle(), RC_REGEX)) { } else if (isAvailable(item.getTitle(), RC_REGEX)) {
rc.append(replace(item.getTitle(), RC_REGEX)); rc.append(replace(item.getTitle(), RC_REGEX));
rc.append("\n"); rc.append(StringUtils.LF);
} else if (isAvailable(item.getTitle(), TAG_REGEX)) { } else if (isAvailable(item.getTitle(), TAG_REGEX)) {
String tag = replace(item.getTitle(), TAG_REGEX); String tag = replace(item.getTitle(), TAG_REGEX);
if (StringUtils.isNotEmpty(tag)) { if (StringUtils.isNotEmpty(tag)) {