- {{ $t('home.table.run_rule') }}: {{
+ {{ $t('api_test.home_page.running_task_list.table_coloum.run_rule') }}: {{
scope.row.scheduleCorn
}}
{{ $t('test_track.plan.next_run_time') }}：{{
diff --git a/system-setting/backend/src/main/resources/db/migration/V131__2.3.0__release.sql b/system-setting/backend/src/main/resources/db/migration/V131__2.3.0__release.sql
index ff8dd5bdcd..651fd74ad4 100644
--- a/system-setting/backend/src/main/resources/db/migration/V131__2.3.0__release.sql
+++ b/system-setting/backend/src/main/resources/db/migration/V131__2.3.0__release.sql
@@ -11,4 +11,9 @@ 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.setting', 'ENABLE', 'text', 1);
INSERT INTO system_parameter (param_key, param_value, type, sort) VALUES ('base.grid.concurrency', '8', 'text', 1);
+DELETE FROM user_group_permission WHERE permission_id = 'WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR';
+INSERT INTO user_group_permission (id, group_id, permission_id, module_id)
+SELECT UUID(), id, 'WORKSPACE_PROJECT_MANAGER:READ+ENVIRONMENT_CONFIG', 'WORKSPACE_PROJECT_MANAGER'
+FROM `group`
+WHERE type = 'WORKSPACE';
diff --git a/system-setting/backend/src/main/resources/permission.json b/system-setting/backend/src/main/resources/permission.json
index 16ceef0bf5..4e912c78fc 100644
--- a/system-setting/backend/src/main/resources/permission.json
+++ b/system-setting/backend/src/main/resources/permission.json
@@ -181,8 +181,8 @@
"resourceId": "WORKSPACE_PROJECT_MANAGER"
},
{
- "id": "WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR",
- "name": "permission.workspace_project_manager.upload_jar",
+ "id": "WORKSPACE_PROJECT_MANAGER:READ+ENVIRONMENT_CONFIG",
+ "name": "permission.workspace_project_manager.environment_config",
"resourceId": "WORKSPACE_PROJECT_MANAGER"
},
{
diff --git a/system-setting/frontend/src/business/system/log/OperatingLog.vue b/system-setting/frontend/src/business/system/log/OperatingLog.vue
index 6c86e4d713..fb5067005f 100644
--- a/system-setting/frontend/src/business/system/log/OperatingLog.vue
+++ b/system-setting/frontend/src/business/system/log/OperatingLog.vue
@@ -214,7 +214,7 @@ export default {
methods: {
isLink(row) {
let uri = getUrl(row, this);
- return (row.operType === 'UPDATE' || row.operType === 'CREATE' || row.operType === 'EXECUTE' || row.operType === 'DEBUG')
+ return (row.operType === 'UPDATE' || row.operType === 'CREATE' || row.operType === 'EXECUTE' || row.operType === 'DEBUG' || row.operType === 'COPY')
&& uri !== "/#";
},
clickResource(resource) {
diff --git a/system-setting/frontend/src/business/workspace/project/MsProject.vue b/system-setting/frontend/src/business/workspace/project/MsProject.vue
index 394da54c03..b584a76f08 100644
--- a/system-setting/frontend/src/business/workspace/project/MsProject.vue
+++ b/system-setting/frontend/src/business/workspace/project/MsProject.vue
@@ -70,7 +70,7 @@
@deleteClick="handleDelete(scope.row)">
diff --git a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java
index 5992a8c241..a8a0b85096 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/issue/platform/JiraPlatform.java
@@ -31,6 +31,7 @@ import java.io.File;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -42,6 +43,7 @@ import java.util.stream.Collectors;
public class JiraPlatform extends AbstractIssuePlatform {
protected JiraClientV2 jiraClientV2;
+ protected SimpleDateFormat sdfWithZone = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
public JiraPlatform(IssuesRequest issuesRequest) {
super(issuesRequest);
@@ -111,8 +113,8 @@ public class JiraPlatform extends AbstractIssuePlatform {
issue.setPlatform(key);
issue.setCustomFields(JSON.toJSONString(customFieldItems));
try {
- issue.setCreateTime(DateUtils.getTimestamp((String) fields.get("created")));
- issue.setUpdateTime(DateUtils.getTimestamp((String) fields.get("updated")));
+ issue.setCreateTime(sdfWithZone.parse((String) fields.get("created")).getTime());
+ issue.setUpdateTime(sdfWithZone.parse((String) fields.get("updated")).getTime());
} catch (Exception e) {
LogUtil.error(e);
}
@@ -465,17 +467,15 @@ public class JiraPlatform extends AbstractIssuePlatform {
} else if (StringUtils.equalsAny(item.getType(), "cascadingSelect")) {
if (item.getValue() != null) {
Map attr = new LinkedHashMap<>();
- if (item.getValue() instanceof List) {
- List values = JSON.parseArray((String) item.getValue());
- if (CollectionUtils.isNotEmpty(values)) {
- if (values.size() > 0) {
- attr.put("id", values.get(0));
- }
- if (values.size() > 1) {
- Map param = new LinkedHashMap<>();
- param.put("id", values.get(1));
- attr.put("child", param);
- }
+ List values = JSON.parseArray((String) item.getValue());
+ if (CollectionUtils.isNotEmpty(values)) {
+ if (values.size() > 0) {
+ attr.put("id", values.get(0));
+ }
+ if (values.size() > 1) {
+ Map param = new LinkedHashMap<>();
+ param.put("id", values.get(1));
+ attr.put("child", param);
}
} else {
attr.put("id", item.getValue());
diff --git a/test-track/frontend/src/i18n/lang/en-US.js b/test-track/frontend/src/i18n/lang/en-US.js
index 238edaf241..93271564ab 100644
--- a/test-track/frontend/src/i18n/lang/en-US.js
+++ b/test-track/frontend/src/i18n/lang/en-US.js
@@ -2,7 +2,26 @@ import el from "element-ui/lib/locale/lang/en";
import fu from "fit2cloud-ui/src/locale/lang/en_US"; // 加载fit2cloud的内容
import mf from "metersphere-frontend/src/i18n/lang/en-US"
-const message = {}
+const message = {
+ home: {
+ table: {
+ index: "Index",
+ task_type: "Task Type",
+ run_rule: "Rule",
+ task_status: "Status",
+ next_execution_time: "Next Execution Time",
+ create_user: "Creator",
+ update_time: "Update time",
+ },
+ case: {
+ index: "Ranking",
+ case_name: "Case Name",
+ case_type: "Case Type",
+ test_plan: "Test Plan",
+ failure_times: "Failure times",
+ }
+ }
+}
export default {
...el,
...fu,
diff --git a/test-track/frontend/src/i18n/lang/zh-CN.js b/test-track/frontend/src/i18n/lang/zh-CN.js
index 5bba75500a..0c0085f50e 100644
--- a/test-track/frontend/src/i18n/lang/zh-CN.js
+++ b/test-track/frontend/src/i18n/lang/zh-CN.js
@@ -2,7 +2,26 @@ import el from "element-ui/lib/locale/lang/zh-CN"; // 加载element的内容
import fu from "fit2cloud-ui/src/locale/lang/zh-CN"; // 加载fit2cloud的内容
import mf from "metersphere-frontend/src/i18n/lang/zh-CN"
-const message = {}
+const message = {
+ home: {
+ table: {
+ index: "序号",
+ task_type: "任务类型",
+ run_rule: "运行规则",
+ task_status: "任务状态",
+ next_execution_time: "下次执行时间",
+ create_user: "创建人",
+ update_time: "更新时间",
+ },
+ case: {
+ index: "排名",
+ case_name: "用例名称",
+ case_type: "用例类型",
+ test_plan: "所属测试计划",
+ failure_times: "失败次数",
+ }
+ }
+}
export default {
...el,
diff --git a/test-track/frontend/src/i18n/lang/zh-TW.js b/test-track/frontend/src/i18n/lang/zh-TW.js
index 285da59e62..3e0df8cc4b 100644
--- a/test-track/frontend/src/i18n/lang/zh-TW.js
+++ b/test-track/frontend/src/i18n/lang/zh-TW.js
@@ -2,7 +2,26 @@ import el from "element-ui/lib/locale/lang/zh-TW";
import fu from "fit2cloud-ui/src/locale/lang/zh-TW"; // 加载fit2cloud的内容
import mf from "metersphere-frontend/src/i18n/lang/zh-TW"
-const message = {}
+const message = {
+ home: {
+ table: {
+ index: "序號",
+ task_type: "任務類型",
+ run_rule: "運行規則",
+ task_status: "任務狀態",
+ next_execution_time: "下次執行時間",
+ create_user: "創建人",
+ update_time: "更新時間",
+ },
+ case: {
+ index: "排名",
+ case_name: "用例名稱",
+ case_type: "用例類型",
+ test_plan: "所屬測試計劃",
+ failure_times: "失敗次數",
+ }
+ }
+}
export default {
...el,