Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/metersphere/controller/LoadTestController.java

@@ -53,6 +53,11 @@ public class LoadTestController {
         loadTestService.delete(request);
     }
 
+    @PostMapping("/run")
+    public void delete(@RequestBody RunTestPlanRequest request) {
+        loadTestService.run(request);
+    }
+
     @GetMapping("/file/metadata/{testId}")
     public FileMetadata getFileMetadata(@PathVariable String testId) {
         return fileService.getFileMetadataByTestId(testId);

backend/src/main/java/io/metersphere/controller/ProjectController.java

@@ -3,9 +3,11 @@ package io.metersphere.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.Project;
+import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.service.ProjectService;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -24,22 +26,26 @@ public class ProjectController {
     }
 
     @PostMapping("/add")
+    @RequiresRoles(RoleConstants.TEST_MANAGER)
     public Project addProject(@RequestBody Project project) {
         return projectService.addProject(project);
     }
 
     @PostMapping("/list/{goPage}/{pageSize}")
+    @RequiresRoles(RoleConstants.TEST_MANAGER)
     public Pager<List<Project>> getProjectList(@PathVariable int goPage, @PathVariable int pageSize) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, projectService.getProjectList());
     }
 
     @GetMapping("/delete/{projectId}")
+    @RequiresRoles(RoleConstants.TEST_MANAGER)
     public void deleteProject(@PathVariable(value = "projectId") String projectId) {
         projectService.deleteProject(projectId);
     }
 
     @PostMapping("/update")
+    @RequiresRoles(RoleConstants.TEST_MANAGER)
     public void updateProject(@RequestBody Project Project) {
         projectService.updateProject(Project);
     }

backend/src/main/java/io/metersphere/controller/WorkspaceController.java

@@ -1,7 +1,13 @@
 package io.metersphere.controller;
 
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.Workspace;
+import io.metersphere.commons.constants.RoleConstants;
+import io.metersphere.commons.utils.PageUtils;
+import io.metersphere.commons.utils.Pager;
 import io.metersphere.service.WorkspaceService;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -13,18 +19,30 @@ public class WorkspaceController {
     @Resource
     private WorkspaceService workspaceService;
 
-    @PostMapping("save")
+    @PostMapping("add")
-    public Workspace saveWorkspace(@RequestBody Workspace workspace) {
+    @RequiresRoles(RoleConstants.ORG_ADMIN)
+    public Workspace addWorkspace(@RequestBody Workspace workspace) {
+        return workspaceService.saveWorkspace(workspace);
+    }
+
+    @PostMapping("update")
+    @RequiresRoles(RoleConstants.ORG_ADMIN)
+    public Workspace updateWorkspace(@RequestBody Workspace workspace) {
+        workspaceService.checkOwner(workspace.getId());
         return workspaceService.saveWorkspace(workspace);
     }
 
     @GetMapping("delete/{workspaceId}")
+    @RequiresRoles(RoleConstants.ORG_ADMIN)
     public void saveWorkspace(@PathVariable String workspaceId) {
+        workspaceService.checkOwner(workspaceId);
         workspaceService.deleteWorkspace(workspaceId);
     }
 
-    @PostMapping("list")
+    @PostMapping("list/{goPage}/{pageSize}")
-    public List<Workspace> getWorkspaceList() {
+    @RequiresRoles(RoleConstants.ORG_ADMIN)
-        return workspaceService.getWorkspaceList();
+    public Pager<List<Workspace>> getWorkspaceList(@PathVariable int goPage, @PathVariable int pageSize) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, workspaceService.getWorkspaceList());
     }
 }

backend/src/main/java/io/metersphere/controller/request/testplan/RunTestPlanRequest.java

@@ -0,0 +1,4 @@
+package io.metersphere.controller.request.testplan;
+
+public class RunTestPlanRequest extends TestPlanRequest {
+}

backend/src/main/java/io/metersphere/service/LoadTestService.java

@@ -6,10 +6,7 @@ import io.metersphere.base.mapper.ext.ExtLoadTestMapper;
 import io.metersphere.commons.constants.LoadTestFileType;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.IOUtils;
-import io.metersphere.controller.request.testplan.DeleteTestPlanRequest;
+import io.metersphere.controller.request.testplan.*;
-import io.metersphere.controller.request.testplan.EditTestPlanRequest;
-import io.metersphere.controller.request.testplan.QueryTestPlanRequest;
-import io.metersphere.controller.request.testplan.SaveTestPlanRequest;
 import io.metersphere.dto.LoadTestDTO;
 import org.apache.commons.lang3.RandomUtils;
 import org.springframework.stereotype.Service;
@@ -147,4 +144,13 @@ public class LoadTestService {
             loadTestMapper.updateByPrimaryKeySelective(loadTest);
         }
     }
+
+    public void run(RunTestPlanRequest request) {
+        final LoadTestWithBLOBs loadTest = loadTestMapper.selectByPrimaryKey(request.getId());
+        if (loadTest == null) {
+            MSException.throwException("无法运行测试，未找到测试：" + request.getId());
+        }
+
+        System.out.println("开始运行：" + loadTest.getName());
+    }
 }

backend/src/main/java/io/metersphere/service/WorkspaceService.java

@@ -45,4 +45,9 @@ public class WorkspaceService {
     public void deleteWorkspace(String workspaceId) {
         workspaceMapper.deleteByPrimaryKey(workspaceId);
     }
+
+    public void checkOwner(String workspaceId) {
+        // TODO 验证当前用户是否拥有当前此空间权限
+    }
+
 }

frontend/src/common/filter.js

@@ -10,8 +10,36 @@ const options = function (value, array) {
   return value;
 };
 
+const timestampFormatDate = function (timestamp) {
+  if (!timestamp) {
+    return timestamp
+  }
+
+  let date = new Date(timestamp);
+
+  let y = date.getFullYear();
+
+  let MM = date.getMonth() + 1;
+  MM = MM < 10 ? ('0' + MM) : MM;
+
+  let d = date.getDate();
+  d = d < 10 ? ('0' + d) : d;
+
+  let h = date.getHours();
+  h = h < 10 ? ('0' + h) : h;
+
+  let m = date.getMinutes();
+  m = m < 10 ? ('0' + m) : m;
+
+  let s = date.getSeconds();
+  s = s < 10 ? ('0' + s) : s;
+
+  return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s
+};
+
 const filters = {
   "options": options,
+  "timestampFormatDate": timestampFormatDate,
 };
 
 export default {

frontend/src/performance/components/common/filter/TimestampFormatDateFilter.js

@@ -1,27 +0,0 @@
-let timestampFormatDate = function (timestamp) {
-  if (!timestamp) {
-    return timestamp
-  }
-
-  let date = new Date(timestamp);
-
-  let y = date.getFullYear();
-
-  let MM = date.getMonth() + 1;
-  MM = MM < 10 ? ('0' + MM) : MM;
-
-  let d = date.getDate();
-  d = d < 10 ? ('0' + d) : d;
-
-  let h = date.getHours();
-  h = h < 10 ? ('0' + h) : h;
-
-  let m = date.getMinutes();
-  m = m < 10 ? ('0' + m) : m;
-
-  let s = date.getSeconds();
-  s = s < 10 ? ('0' + s) : s;
-
-  return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s
-};
-export default timestampFormatDate

frontend/src/performance/components/project/MsProject.vue

@@ -4,7 +4,10 @@
       <el-card>
         <div slot="header">
           <el-row type="flex" justify="space-between" align="middle">
-            <span class="title">项目</span>
+            <span class="title">
+              项目
+              <ms-create-box :tips="btnTips" :exec="create"/>
+            </span>
             <span class="search">
                     <el-input type="text" size="small" placeholder="根据名称搜索" prefix-icon="el-icon-search"
                               maxlength="60" v-model="condition" clearable/>
@@ -21,8 +24,24 @@
             </template>
           </el-table-column>
         </el-table>
+        <div>
+          <el-row>
+            <el-col :span="22" :offset="1">
+              <div class="table-page">
+                <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page.sync="currentPage"
+                  :page-sizes="[5, 10, 20, 50, 100]"
+                  :page-size="pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total">
+                </el-pagination>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
       </el-card>
-      <ms-create-box :tips="btnTips" :exec="create"/>
 
       <el-dialog title="创建项目" :visible.sync="createVisible">
         <el-form :model="form" :rules="rules" ref="form" label-position="left" label-width="100px" size="small">
@@ -56,6 +75,9 @@
         condition: "",
         items: [],
         form: {},
+        currentPage: 1,
+        pageSize: 5,
+        total: 0,
         rules: {
           name: [
             {required: true, message: '请输入项目名称', trigger: 'blur'},
@@ -113,10 +135,19 @@
         });
       },
       list() {
-        this.$post("/project/list/1/10", {}, (response) => {
+        let url = "/project/list/" + this.currentPage + '/' + this.pageSize;
+        this.$post(url, {}, (response) => {
           this.items = response.data;
         })
-      }
+      },
+      handleSizeChange(size) {
+        this.pageSize = size;
+        this.list();
+      },
+      handleCurrentChange(current) {
+        this.currentPage = current;
+        this.list();
+      },
     }
   }
 </script>

frontend/src/performance/components/settings/Workspace.vue

@@ -3,7 +3,10 @@
     <el-card>
       <div slot="header">
         <el-row type="flex" justify="space-between" align="middle">
-          <span class="title">工作空间</span>
+          <span class="title">
+            工作空间
+            <ms-create-box :tips="btnTips" :exec="create"/>
+          </span>
           <span class="search">
                     <el-input type="text" size="small" placeholder="根据名称搜索" prefix-icon="el-icon-search"
                               maxlength="60" v-model="condition" clearable/>
@@ -20,8 +23,25 @@
           </template>
         </el-table-column>
       </el-table>
+      <div>
+        <el-row>
+          <el-col :span="22" :offset="1">
+            <div class="table-page">
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page.sync="currentPage"
+                :page-sizes="[5, 10, 20, 50, 100]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="total">
+              </el-pagination>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
     </el-card>
-    <ms-create-box :tips="btnTips" :exec="create"/>
+
     <el-dialog title="创建工作空间" :visible.sync="createVisible" width="30%">
       <el-form :model="form" :rules="rules" ref="form" label-position="left" label-width="100px" size="small">
         <el-form-item label="名称" prop="name">
@@ -57,12 +77,16 @@
         this.$refs[formName].validate((valid) => {
           if (valid) {
             this.loading = true;
-            this.$post("/workspace/save", this.form, () => {
+            let saveType = 'add';
+            if (this.form.id) {
+              saveType = 'update'
+            }
+            this.$post("/workspace/" + saveType, this.form, () => {
               this.createVisible = false;
               this.loading = false;
               this.list();
               Message.success('保存成功');
-            })
+            });
           } else {
             return false;
           }
@@ -96,10 +120,22 @@
         });
       },
       list() {
-        this.$post('/workspace/list', {}, response => {
+        let url = '/workspace/list/' + this.currentPage + '/' + this.pageSize;
-          this.items = response.data;
+        this.$post(url, {}, response => {
+          let data = response.data;
+
+          this.items = data.listObject;
+          this.total = data.itemCount;
         })
-      }
+      },
+      handleSizeChange(size) {
+        this.pageSize = size;
+        this.list();
+      },
+      handleCurrentChange(current) {
+        this.currentPage = current;
+        this.list();
+      },
     },
     data() {
       return {
@@ -108,6 +144,9 @@
         btnTips: "添加工作空间",
         condition: "",
         items: [],
+        currentPage: 1,
+        pageSize: 5,
+        total: 0,
         form: {
           // name: "",
           // description: ""

frontend/src/performance/components/testPlan/CreateTestPlan.vue

@@ -51,6 +51,7 @@
         listProjectPath: "/project/listAll",
         savePath: "/testplan/save",
         editPath: "/testplan/edit",
+        runPath: "/testplan/run",
         projects: [],
         active: '0',
         tabs: [{
@@ -85,28 +86,7 @@
           return;
         }
 
-        let formData = new FormData();
+        let options = this.getSaveOption();
-        let url = this.testPlan.id ? this.editPath : this.savePath;
-
-        if (!this.testPlan.file.id) {
-          formData.append("file", this.testPlan.file);
-        }
-        // file属性不需要json化
-        let requestJson = JSON.stringify(this.testPlan, function (key, value) {
-          return key === "file" ? undefined : value
-        });
-        formData.append('request', new Blob([requestJson], {
-          type: "application/json"
-        }));
-
-        let options = {
-          method: 'POST',
-          url: url,
-          data: formData,
-          headers: {
-            'Content-Type': undefined
-          }
-        };
 
         this.$request(options).then(response => {
           if (response) {
@@ -122,12 +102,48 @@
           return;
         }
 
-        /// todo: saveAndRun
+        let options = this.getSaveOption();
-        this.$message({
+
-          message: '保存成功，开始运行！',
+        this.$request(options).then(response => {
-          type: 'success'
+          if (response) {
+            this.$message({
+              message: '保存成功！',
+              type: 'success'
+            });
+
+            this.$post(this.runPath, {id: this.testPlan.id}).then(() => {
+              this.$message({
+                message: '正在运行！',
+                type: 'success'
+              });
+            })
+          }
         });
       },
+      getSaveOption() {
+        let formData = new FormData();
+        let url = this.testPlan.id ? this.editPath : this.savePath;
+
+        if (!this.testPlan.file.id) {
+          formData.append("file", this.testPlan.file);
+        }
+        // file属性不需要json化
+        let requestJson = JSON.stringify(this.testPlan, function (key, value) {
+          return key === "file" ? undefined : value
+        });
+        formData.append('request', new Blob([requestJson], {
+          type: "application/json"
+        }));
+
+        return  {
+          method: 'POST',
+          url: url,
+          data: formData,
+          headers: {
+            'Content-Type': undefined
+          }
+        };
+      },
       cancel() {
         this.$router.push({path: '/'})
       },

frontend/src/performance/main.js

@@ -8,7 +8,6 @@ import App from './App.vue';
 import router from "./components/router/router";
 import './permission' // permission control
 import i18n from "../i18n/i18n";
-import timestampFormatDate from "./components/common/filter/TimestampFormatDateFilter";
 import store from "./store";
 import {permission} from './permission'
 
@@ -20,9 +19,6 @@ Vue.use(ElementUI, {
 Vue.use(filters);
 Vue.use(ajax);
 
-// filter
-Vue.filter('timestampFormatDate', timestampFormatDate);
-
 // v-permission
 Vue.directive('permission', permission)