From 618846c73a60535411c07b2815a82bddf3356a89 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 19 Feb 2020 13:19:12 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=9B=86=E5=90=88=E5=B1=95=E7=A4=BA=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/login/Login.vue                               | 6 ++++--
 frontend/src/performance/App.vue                           | 6 ++----
 .../src/performance/components/settings/SettingMenu.vue    | 6 +++---
 frontend/src/performance/permission.js                     | 7 +++++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index a0ddc5ac2b..fd8dccca81 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -109,8 +109,10 @@
             this.$post("signin", this.form, (response) => {
               // 登录信息保存 cookie
               Cookies.set(TokenKey, response.data);
-              // 保存上次角色
-              localStorage.setItem("lastSourceId", JSON.parse(Cookies.get(TokenKey)).lastSourceId);
+              let rolesArray = response.data.roles;
+              let roles = rolesArray.map(r => r.id);
+              // 保存角色
+              localStorage.setItem("roles", roles);
               window.location.href = "/"
             });
           } else {
diff --git a/frontend/src/performance/App.vue b/frontend/src/performance/App.vue
index de6a245a25..45dadf7905 100644
--- a/frontend/src/performance/App.vue
+++ b/frontend/src/performance/App.vue
@@ -2,7 +2,6 @@
   <el-col v-if="auth">
     <el-row id="header-top" type="flex" justify="space-between" align="middle">
       <a class="logo"/>
-      <ms-switch-user/>
       <ms-user/>
     </el-row>
     <el-row id="header-bottom" type="flex" justify="space-between" align="middle">
@@ -11,7 +10,7 @@
       </el-col>
       <el-col :span="4">
         <el-row type="flex" justify="center" align="middle">
-          <router-link to="/createTest">
+          <router-link to="/createTest" v-permission="['test_user','test_manager']">
             <el-button type="primary" size="small">创建测试</el-button>
           </router-link>
         </el-row>
@@ -30,7 +29,6 @@
   import MsSetting from "./components/HeaderSetting";
   import MsView from "./components/router/View";
   import MsUser from "./components/HeaderUser";
-  import MsSwitchUser from "./components/HeaderSwitchUser";
   import MsWebSocket from "./components/websocket/WebSocket";
 
   export default {
@@ -51,7 +49,7 @@
         window.location.href = "/login"
       });
     },
-    components: {MsWebSocket, MsUser, MsMenus, MsSetting, MsView, MsSwitchUser},
+    components: {MsWebSocket, MsUser, MsMenus, MsSetting, MsView},
     methods: {
     }
   }
diff --git a/frontend/src/performance/components/settings/SettingMenu.vue b/frontend/src/performance/components/settings/SettingMenu.vue
index 9f2237b346..147ec2f87f 100644
--- a/frontend/src/performance/components/settings/SettingMenu.vue
+++ b/frontend/src/performance/components/settings/SettingMenu.vue
@@ -1,17 +1,17 @@
 <template>
     <el-menu menu-trigger="click" :default-active="$route.path" router>
-        <el-submenu index="1">
+        <el-submenu index="1" v-permission="['admin']">
             <template slot="title">
                 <font-awesome-icon class="icon account" :icon="['far', 'address-card']" size="lg"/>
                 <span>账号</span>
             </template>
             <el-menu-item index="/setting/user">用户</el-menu-item>
-            <el-menu-item index="/setting/testresourcepool">测试资源池</el-menu-item>
+            <el-menu-item index="/setting/testresourcepool" v-permission="['test']">测试资源池</el-menu-item>
             <el-menu-item index="/setting/organization">组织</el-menu-item>
             <el-menu-item index="/setting/workspace">工作空间</el-menu-item>
             <el-menu-item>API Keys</el-menu-item>
         </el-submenu>
-        <el-submenu index=2>
+        <el-submenu index=2 v-permission="['admin','org_admin']">
             <template slot="title">
                 <font-awesome-icon class="icon workspace" :icon="['far', 'clone']" size="lg"/>
                 <span>工作空间</span>
diff --git a/frontend/src/performance/permission.js b/frontend/src/performance/permission.js
index 2862e6fac5..07e52ca0c2 100644
--- a/frontend/src/performance/permission.js
+++ b/frontend/src/performance/permission.js
@@ -7,10 +7,13 @@ const whiteList = ['/login']; // no redirect whitelist
 export const permission = {
   inserted(el, binding) {
     const { value } = binding;
-    const roles = localStorage.getItem("lastSourceId");
+    const rolesString = localStorage.getItem("roles");
+    const roles = rolesString.split(',');
     if (value && value instanceof Array && value.length > 0) {
       const permissionRoles = value;
-      const hasPermission = permissionRoles.includes(roles);
+      const hasPermission = roles.some(role => {
+        return permissionRoles.includes(role)
+      });
       if (!hasPermission) {
         el.parentNode && el.parentNode.removeChild(el)
       }

From 63759b9f4fcc6b105ce940e93295ae827264347b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 14:11:49 +0800
Subject: [PATCH 02/10] project loading

---
 .../src/performance/components/project/MsProject.vue | 12 +++++-------
 .../performance/components/settings/Workspace.vue    |  5 +----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/frontend/src/performance/components/project/MsProject.vue b/frontend/src/performance/components/project/MsProject.vue
index eae9ec5c24..bbd7761116 100644
--- a/frontend/src/performance/components/project/MsProject.vue
+++ b/frontend/src/performance/components/project/MsProject.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="project-container">
     <div class="main-content">
-      <el-card>
+      <el-card v-loading="result.loading">
         <div slot="header">
           <el-row type="flex" justify="space-between" align="middle">
             <span class="title">
@@ -70,7 +70,7 @@
     data() {
       return {
         createVisible: false,
-        loading: false,
+        result: {},
         btnTips: "添加项目",
         condition: "",
         items: [],
@@ -87,7 +87,7 @@
       }
     },
     mounted() {
-      // this.list();
+      this.list();
     },
     destroyed() {
       this.createVisible = false;
@@ -104,14 +104,12 @@
       submit(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            this.loading = true;
             let saveType = "add";
             if (this.form.id) {
               saveType = "update"
             }
-            this.$post("/project/" + saveType, this.form, () => {
+            this.result = this.$post("/project/" + saveType, this.form, () => {
               this.createVisible = false;
-              this.loading = false;
               this.list();
               Message.success('保存成功');
             });
@@ -136,7 +134,7 @@
       },
       list() {
         let url = "/project/list/" + this.currentPage + '/' + this.pageSize;
-        this.$post(url, {}, (response) => {
+        this.result = this.$post(url, {}, (response) => {
           this.items = response.data;
         })
       },
diff --git a/frontend/src/performance/components/settings/Workspace.vue b/frontend/src/performance/components/settings/Workspace.vue
index a225bcc526..f8d80481c4 100644
--- a/frontend/src/performance/components/settings/Workspace.vue
+++ b/frontend/src/performance/components/settings/Workspace.vue
@@ -13,7 +13,7 @@
                 </span>
         </el-row>
       </div>
-      <el-table :data="items" style="width: 100%" v-loading="loading">
+      <el-table :data="items" style="width: 100%">
         <el-table-column prop="name" label="名称"/>
         <el-table-column prop="description" label="描述"/>
         <el-table-column>
@@ -76,14 +76,12 @@
       submit(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            this.loading = true;
             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('保存成功');
             });
@@ -94,7 +92,6 @@
       },
       edit(row) {
         this.createVisible = true;
-        this.loading = true;
         this.form = row;
 
         // let self = this;

From 40c8b428342fdec7ed4ac67ca27542adc5579f34 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 14:33:23 +0800
Subject: [PATCH 03/10] SessionUser

---
 .../commons/constants/SessionConstants.java   |  5 ++++
 .../main/java/io/metersphere/dto/UserDTO.java | 15 +++++++++--
 .../io/metersphere/security/ShiroDBRealm.java |  4 +--
 .../io/metersphere/service/UserService.java   |  2 ++
 .../java/io/metersphere/user/SessionUser.java | 27 +++++++++++++++++++
 .../io/metersphere/user/SessionUtils.java     | 19 ++++++++++++-
 6 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/SessionConstants.java

diff --git a/backend/src/main/java/io/metersphere/commons/constants/SessionConstants.java b/backend/src/main/java/io/metersphere/commons/constants/SessionConstants.java
new file mode 100644
index 0000000000..85e4ff1935
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/SessionConstants.java
@@ -0,0 +1,5 @@
+package io.metersphere.commons.constants;
+
+public class SessionConstants {
+    public static final String ATTR_USER = "user";
+}
diff --git a/backend/src/main/java/io/metersphere/dto/UserDTO.java b/backend/src/main/java/io/metersphere/dto/UserDTO.java
index b6e684af51..555e1feff1 100644
--- a/backend/src/main/java/io/metersphere/dto/UserDTO.java
+++ b/backend/src/main/java/io/metersphere/dto/UserDTO.java
@@ -1,6 +1,7 @@
 package io.metersphere.dto;
 
 import io.metersphere.base.domain.Role;
+import io.metersphere.base.domain.UserRole;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +23,10 @@ public class UserDTO {
 
     private String lastSourceId;
 
+    private List<Role> roles = new ArrayList<>();
+
+    private List<UserRole> userRoles = new ArrayList<>();
+
     public String getLastSourceId() {
         return lastSourceId;
     }
@@ -30,8 +35,6 @@ public class UserDTO {
         this.lastSourceId = lastSourceId;
     }
 
-    private List<Role> roles = new ArrayList<>();
-
     public List<Role> getRoles() {
         return roles;
     }
@@ -97,4 +100,12 @@ public class UserDTO {
     public void setUpdateTime(Long updateTime) {
         this.updateTime = updateTime;
     }
+
+    public List<UserRole> getUserRoles() {
+        return userRoles;
+    }
+
+    public void setUserRoles(List<UserRole> userRoles) {
+        this.userRoles = userRoles;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/security/ShiroDBRealm.java b/backend/src/main/java/io/metersphere/security/ShiroDBRealm.java
index 7f03597ec9..76f1bb5739 100644
--- a/backend/src/main/java/io/metersphere/security/ShiroDBRealm.java
+++ b/backend/src/main/java/io/metersphere/security/ShiroDBRealm.java
@@ -5,7 +5,7 @@ import io.metersphere.base.domain.Role;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.service.UserService;
 import io.metersphere.user.SessionUser;
-import org.apache.shiro.SecurityUtils;
+import io.metersphere.user.SessionUtils;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
@@ -68,7 +68,7 @@ public class ShiroDBRealm extends AuthorizingRealm {
         // TODO 密码验证
 
         SessionUser sessionUser = SessionUser.fromUser(user);
-        SecurityUtils.getSubject().getSession().setAttribute("user", sessionUser);
+        SessionUtils.putUser(sessionUser);
         return new SimpleAuthenticationInfo(userId, password, getName());
     }
 
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 2f37a2aab3..901447a9c8 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -89,6 +89,8 @@ public class UserService {
         if (CollectionUtils.isEmpty(userRoleList)) {
             return userDTO;
         }
+        // 设置 user_role
+        userDTO.setUserRoles(userRoleList);
 
         List<String> roleIds = userRoleList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
 
diff --git a/backend/src/main/java/io/metersphere/user/SessionUser.java b/backend/src/main/java/io/metersphere/user/SessionUser.java
index 187a39621f..a9066df24a 100644
--- a/backend/src/main/java/io/metersphere/user/SessionUser.java
+++ b/backend/src/main/java/io/metersphere/user/SessionUser.java
@@ -1,17 +1,44 @@
 package io.metersphere.user;
 
 import io.metersphere.dto.UserDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 
+import static io.metersphere.commons.constants.RoleConstants.*;
+
 public class SessionUser extends UserDTO implements Serializable {
 
     private static final long serialVersionUID = -7149638440406959033L;
 
+    private String workspaceId;
+    private String organizationId;
+
+    public String getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
     public static SessionUser fromUser(UserDTO user) {
         SessionUser sessionUser = new SessionUser();
         BeanUtils.copyProperties(user, sessionUser);
+        String lastSourceId = sessionUser.getLastSourceId();
+        user.getUserRoles().forEach(ur -> {
+            if (StringUtils.equals(ur.getSourceId(), lastSourceId)) {
+                if (StringUtils.equals(ur.getRoleId(), ORG_ADMIN)) {
+                    sessionUser.organizationId = lastSourceId;
+                    return;
+                }
+                if (StringUtils.equalsAny(ur.getRoleId(), TEST_MANAGER, TEST_USER, TEST_VIEWER)) {
+                    sessionUser.workspaceId = lastSourceId;
+                }
+            }
+        });
+
         return sessionUser;
     }
 
diff --git a/backend/src/main/java/io/metersphere/user/SessionUtils.java b/backend/src/main/java/io/metersphere/user/SessionUtils.java
index 0de933ebe8..ff569833f0 100644
--- a/backend/src/main/java/io/metersphere/user/SessionUtils.java
+++ b/backend/src/main/java/io/metersphere/user/SessionUtils.java
@@ -4,15 +4,32 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
 
+import java.util.Optional;
+
+import static io.metersphere.commons.constants.SessionConstants.ATTR_USER;
+
 public class SessionUtils {
 
     public static SessionUser getUser() {
         try {
             Subject subject = SecurityUtils.getSubject();
             Session session = subject.getSession();
-            return (SessionUser) session.getAttribute("user");
+            return (SessionUser) session.getAttribute(ATTR_USER);
         } catch (Exception e) {
             return null;
         }
     }
+
+    //
+    public static void putUser(SessionUser sessionUser) {
+        SecurityUtils.getSubject().getSession().setAttribute(ATTR_USER, sessionUser);
+    }
+
+    public static String getCurrentWorkspaceId() {
+        return Optional.ofNullable(getUser()).orElse(new SessionUser()).getWorkspaceId();
+    }
+
+    public static String getCurrentOrganizationId() {
+        return Optional.ofNullable(getUser()).orElse(new SessionUser()).getOrganizationId();
+    }
 }

From d3957e929ea880b5b300c0bdbb1ff9116a383390 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 15:02:46 +0800
Subject: [PATCH 04/10] header v-permission

---
 frontend/src/performance/components/HeaderMenus.vue       | 8 ++++----
 frontend/src/performance/components/project/MsProject.vue | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/performance/components/HeaderMenus.vue b/frontend/src/performance/components/HeaderMenus.vue
index c7b97f699c..9565b41f5c 100644
--- a/frontend/src/performance/components/HeaderMenus.vue
+++ b/frontend/src/performance/components/HeaderMenus.vue
@@ -2,13 +2,13 @@
   <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router
            menu-trigger="click">
     <el-menu-item index="1"><a href="/" style="text-decoration: none;">{{ $t("i18n.home") }}</a></el-menu-item>
-    <el-submenu index="2" popper-class="submenu">
+    <el-submenu index="2" popper-class="submenu" v-permission="['org_admin']">
       <template slot="title">工作空间</template>
       <el-menu-item index="2-1">工作空间1</el-menu-item>
       <el-menu-item index="2-2">工作空间2</el-menu-item>
       <el-menu-item index="2-3">显示全部</el-menu-item>
     </el-submenu>
-    <el-submenu index="3" popper-class="submenu">
+    <el-submenu index="3" popper-class="submenu" v-permission="['test_manager']">
       <template slot="title">项目</template>
       <el-menu-item index="3-1">项目1</el-menu-item>
       <el-menu-item index="3-2">项目2</el-menu-item>
@@ -21,7 +21,7 @@
         <el-button type="text">创建项目</el-button>
       </el-menu-item>
     </el-submenu>
-    <el-submenu index="4" popper-class="submenu">
+    <el-submenu index="4" popper-class="submenu" v-permission="['test_manager', 'test_user']">
       <template slot="title">测试</template>
       <recent-test-plan/>
       <el-divider/>
@@ -33,7 +33,7 @@
         <el-button type="text">创建测试</el-button>
       </el-menu-item>
     </el-submenu>
-    <el-submenu index="5" popper-class="submenu">
+    <el-submenu index="5" popper-class="submenu" v-permission="['test_manager', 'test_user', 'test_viewer']">
       <template slot="title">报告</template>
       <el-menu-item index="5-1">报告1</el-menu-item>
       <el-menu-item index="5-2">报告2</el-menu-item>
diff --git a/frontend/src/performance/components/project/MsProject.vue b/frontend/src/performance/components/project/MsProject.vue
index bbd7761116..8247d6fc9f 100644
--- a/frontend/src/performance/components/project/MsProject.vue
+++ b/frontend/src/performance/components/project/MsProject.vue
@@ -14,7 +14,7 @@
                 </span>
           </el-row>
         </div>
-        <el-table :data="items" style="width: 100%" v-loading="loading">
+        <el-table :data="items" style="width: 100%">
           <el-table-column prop="name" label="名称"/>
           <el-table-column prop="description" label="描述"/>
           <el-table-column>

From 37001b2572b3181a9c29923a219230441f04ad12 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 19 Feb 2020 15:15:53 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/HeaderSwitchUser.vue           | 114 ------------------
 .../components/settings/Organization.vue      |  13 +-
 .../performance/components/settings/User.vue  |  13 +-
 3 files changed, 12 insertions(+), 128 deletions(-)
 delete mode 100644 frontend/src/performance/components/HeaderSwitchUser.vue

diff --git a/frontend/src/performance/components/HeaderSwitchUser.vue b/frontend/src/performance/components/HeaderSwitchUser.vue
deleted file mode 100644
index 292390eaad..0000000000
--- a/frontend/src/performance/components/HeaderSwitchUser.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <el-row>
-    <el-button type="text" @click="open">切换角色-{{ currentUserRole }}</el-button>
-    <el-dialog title="角色列表" :visible.sync="createVisible" width="30%">
-      <el-tree :data="userRoleList"
-               @node-click="handleNodeClick"
-               :props="defaultProps"
-               ></el-tree>
-      <div style="text-align: center; margin-top: 20px;">
-        <el-button type="info" size="mini" class="ms-button" @click="closeDialog">取消</el-button>
-        <el-button type="primary" size="mini" style="margin-left: 50px;" @click="changeSubmit">保存</el-button>
-      </div>
-    </el-dialog>
-  </el-row>
-</template>
-
-<script>
-  import Cookies from "js-cookie"
-  import {TokenKey} from "../../common/constants"
-
-  export default {
-    name: "MsSwitchUser",
-    computed: {
-      currentUserRole() {
-        return this.userInfo.lastSourceId;
-      }
-    },
-    created() {
-      this.getUserRoleList();
-      this.getUserInfo();
-    },
-    data() {
-      return {
-        createVisible: false,
-        defaultProps: {
-          children: 'children',
-          label: 'switchInfo'
-        },
-        switchInfo: '',
-        userRoleList: [],
-        selectNode:[],
-        userInfo: {},
-        userId: JSON.parse(Cookies.get(TokenKey)).id
-      }
-    },
-    methods: {
-      open() {
-        this.createVisible = true;
-      },
-      getUserRoleList() {
-        this.$get('user/rolelist/' + this.userId).then(response => {
-          let roleList = response.data.data;
-          let newRoleList = [];
-          roleList.forEach(item => {
-            // item.current = item.id === this.userInfo.lastSourceId;
-            item.current = item.roleId;
-            if (item.current) {
-              if (item.name) {
-                item.switchInfo = item.name + " [" + item.desc + "]";
-              } else {
-                item.switchInfo = "MeterSphere[系统管理员]";
-              }
-            }
-            if (!item.parentId) {
-              item.hasChild = false;
-              item.children = [];
-              newRoleList.push(item);
-            } else {
-              newRoleList.forEach(userRole => {
-                if (userRole.id === item.parentId) {
-                  userRole.children.push(item);
-                  userRole.hasChild = true;
-                }
-              })
-            }
-          })
-          this.userRoleList = newRoleList;
-        })
-      },
-      closeDialog() {
-        this.createVisible = false;
-      },
-      switchRole(selectNode) {
-        if (!selectNode.switchable) {
-          return;
-        }
-        this.$post("user/switch/source/" + selectNode.roleId).then(() => {
-          this.getUserInfo();
-          // localStorage.setItem("lastSourceId", "bbbbb");
-          this.closeDialog();
-        });
-        localStorage.setItem("lastSourceId", selectNode.roleId);
-        window.location.reload();
-      },
-      changeSubmit() {
-        this.switchRole(this.selectNode);
-      },
-      handleNodeClick(data) {
-        this.selectNode = data;
-        window.console.log(data)
-      },
-      getUserInfo() {
-        this.$get("/user/info/" + this.userId).then(response => {
-          this.userInfo = response.data.data;
-        })
-      }
-
-    }
-
-  }
-</script>
-
-<style scoped>
-</style>
diff --git a/frontend/src/performance/components/settings/Organization.vue b/frontend/src/performance/components/settings/Organization.vue
index 9f5008a775..b337b3fbcd 100644
--- a/frontend/src/performance/components/settings/Organization.vue
+++ b/frontend/src/performance/components/settings/Organization.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="result.loading">
 
     <el-card>
       <div slot="header">
@@ -87,7 +87,7 @@
         deletePath: '/organization/delete/',
         createPath: '/organization/add',
         updatePath: '/organization/update',
-        loading: false,
+        result: {},
         createVisible: false,
         updateVisible: false,
         multipleSelection: [],
@@ -133,7 +133,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$get(this.deletePath + row.id,() => {
+          this.result = this.$get(this.deletePath + row.id,() => {
             this.$message({
               type: 'success',
               message: '删除成功!'
@@ -150,7 +150,7 @@
       createOrganization(createOrganizationForm) {
         this.$refs[createOrganizationForm].validate( valide => {
           if (valide) {
-            this.$post(this.createPath, this.form,() => {
+            this.result = this.$post(this.createPath, this.form,() => {
               this.$message({
                 type: 'success',
                 message: '添加成功!'
@@ -166,14 +166,13 @@
       updateOrganization(udpateOrganizationForm) {
         this.$refs[udpateOrganizationForm].validate(valide => {
           if (valide) {
-            this.$post(this.updatePath, this.form,() => {
+            this.result = this.$post(this.updatePath, this.form,() => {
               this.$message({
                 type: 'success',
                 message: '修改成功!'
               });
               this.updateVisible = false;
               this.initTableData();
-              self.loading = false;
               });
           } else {
             return false;
@@ -181,7 +180,7 @@
         })
       },
       initTableData() {
-        this.$post(this.buildPagePath(this.queryPath),{},response => {
+        this.result = this.$post(this.buildPagePath(this.queryPath),{},response => {
           let data = response.data;
           this.total = data.itemCount;
           this.tableData = data.listObject;
diff --git a/frontend/src/performance/components/settings/User.vue b/frontend/src/performance/components/settings/User.vue
index 1067726a79..fe8e1901ad 100644
--- a/frontend/src/performance/components/settings/User.vue
+++ b/frontend/src/performance/components/settings/User.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="result.loading">
 
     <el-card>
       <div slot="header">
@@ -115,7 +115,7 @@
         deletePath: '/user/delete/',
         createPath: '/user/add',
         updatePath: '/user/update',
-        loading: false,
+        result: {},
         createVisible: false,
         updateVisible: false,
         multipleSelection: [],
@@ -180,7 +180,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$get(this.deletePath + row.id, () => {
+          this.result = this.$get(this.deletePath + row.id, () => {
             this.$message({
               type: 'success',
               message: '删除成功!'
@@ -197,7 +197,7 @@
       createUser(createUserForm) {
         this.$refs[createUserForm].validate(valide => {
           if (valide) {
-            this.$post(this.createPath, this.form, () => {
+            this.result = this.$post(this.createPath, this.form, () => {
               this.$message({
                 type: 'success',
                 message: '添加成功!'
@@ -213,14 +213,13 @@
       updateUser(updateUserForm) {
         this.$refs[updateUserForm].validate(valide => {
           if (valide) {
-            this.$post(this.updatePath, this.form,() => {
+            this.result = this.$post(this.updatePath, this.form,() => {
               this.$message({
                   type: 'success',
                   message: '修改成功!'
               });
               this.updateVisible = false;
               this.initTableData();
-              self.loading = false;
               });
           } else {
             return false;
@@ -228,7 +227,7 @@
         })
       },
       initTableData() {
-        this.$post(this.buildPagePath(this.queryPath),{},response => {
+        this.result = this.$post(this.buildPagePath(this.queryPath),{},response => {
             let data = response.data;
             this.total = data.itemCount;
             this.tableData = data.listObject;

From 3171ba063c1702db2ea1fc2050bef3eb10787a67 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 15:26:21 +0800
Subject: [PATCH 06/10] username auto focus

---
 frontend/src/login/Login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index fd8dccca81..6c612a882f 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -16,7 +16,7 @@
           </div>
           <div class="form">
             <el-form-item prop="username">
-              <el-input v-model="form.username" placeholder="邮箱" autocomplete="off" maxlength="100"
+              <el-input v-model="form.username" placeholder="邮箱" autofocus autocomplete="off" maxlength="100"
                         show-word-limit/>
             </el-form-item>
             <el-form-item prop="password">

From ba4c27281e5475909f0889f6f0b0a838c15b7cc9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 15:37:52 +0800
Subject: [PATCH 07/10] project page limit

---
 frontend/src/performance/components/project/MsProject.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/performance/components/project/MsProject.vue b/frontend/src/performance/components/project/MsProject.vue
index 8247d6fc9f..d3272fdcd6 100644
--- a/frontend/src/performance/components/project/MsProject.vue
+++ b/frontend/src/performance/components/project/MsProject.vue
@@ -135,7 +135,9 @@
       list() {
         let url = "/project/list/" + this.currentPage + '/' + this.pageSize;
         this.result = this.$post(url, {}, (response) => {
-          this.items = response.data;
+          let data = response.data;
+          this.items = data.listObject;
+          this.total = data.itemCount;
         })
       },
       handleSizeChange(size) {

From a6cca8e701317b3ea303dea6d92436e26a2deef5 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 15:42:03 +0800
Subject: [PATCH 08/10] project set workspace_id

---
 .../src/main/java/io/metersphere/service/ProjectService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index 2a9f1867cf..0db6e2e0df 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -2,6 +2,7 @@ package io.metersphere.service;
 
 import io.metersphere.base.domain.Project;
 import io.metersphere.base.mapper.ProjectMapper;
+import io.metersphere.user.SessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,8 +21,8 @@ public class ProjectService {
         long createTime = System.currentTimeMillis();
         project.setCreateTime(createTime);
         project.setUpdateTime(createTime);
-        // todo set workspace id
-//        project.setWorkspaceId();
+        // set workspace id
+        project.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         projectMapper.insertSelective(project);
         return project;
     }

From e5f57dc68bc8d38d313d7aacfdab0db47ce1810a Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 16:28:15 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/service/WorkspaceService.java | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/WorkspaceService.java b/backend/src/main/java/io/metersphere/service/WorkspaceService.java
index eab372637b..8741962410 100644
--- a/backend/src/main/java/io/metersphere/service/WorkspaceService.java
+++ b/backend/src/main/java/io/metersphere/service/WorkspaceService.java
@@ -1,8 +1,13 @@
 package io.metersphere.service;
 
+import io.metersphere.base.domain.UserRole;
 import io.metersphere.base.domain.Workspace;
+import io.metersphere.base.domain.WorkspaceExample;
 import io.metersphere.base.mapper.WorkspaceMapper;
+import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.user.SessionUser;
+import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -10,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -21,10 +27,9 @@ public class WorkspaceService {
         if (StringUtils.isBlank(workspace.getName())) {
             MSException.throwException("Workspace name cannot be null.");
         }
-        // TODO 组织ID 暂无
-        if (StringUtils.isBlank(workspace.getOrganizationId())) {
-            workspace.setOrganizationId("root");
-        }
+        // set organization id
+        workspace.setOrganizationId(SessionUtils.getCurrentOrganizationId());
+
         long currentTime = System.currentTimeMillis();
         if (StringUtils.isBlank(workspace.getId())) {
             workspace.setId(UUID.randomUUID().toString()); // 设置ID
@@ -47,7 +52,18 @@ public class WorkspaceService {
     }
 
     public void checkOwner(String workspaceId) {
-        // TODO 验证当前用户是否拥有当前此空间权限
+        SessionUser user = SessionUtils.getUser();
+        List<String> orgIds = user.getUserRoles().stream()
+                .filter(ur -> RoleConstants.ORG_ADMIN.equals(ur.getRoleId()))
+                .map(UserRole::getSourceId)
+                .collect(Collectors.toList());
+        WorkspaceExample example = new WorkspaceExample();
+        example.createCriteria()
+                .andOrganizationIdIn(orgIds)
+                .andIdEqualTo(workspaceId);
+        if (workspaceMapper.countByExample(example) == 0) {
+            MSException.throwException("The current workspace does not belong to the current user");
+        }
     }
 
 }

From 0728ad91af98e37366512e675f9897629e56b1b9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 19 Feb 2020 16:51:11 +0800
Subject: [PATCH 10/10] project workspace name check

---
 .../metersphere/controller/WorkspaceController.java |  2 +-
 .../java/io/metersphere/service/ProjectService.java | 13 +++++++++++++
 .../io/metersphere/service/WorkspaceService.java    |  7 +++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
index 52efa2cff9..3d0f98bc8f 100644
--- a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
+++ b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
@@ -34,7 +34,7 @@ public class WorkspaceController {
 
     @GetMapping("delete/{workspaceId}")
     @RequiresRoles(RoleConstants.ORG_ADMIN)
-    public void saveWorkspace(@PathVariable String workspaceId) {
+    public void deleteWorkspace(@PathVariable String workspaceId) {
         workspaceService.checkOwner(workspaceId);
         workspaceService.deleteWorkspace(workspaceId);
     }
diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index 0db6e2e0df..428bc4a641 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -1,8 +1,11 @@
 package io.metersphere.service;
 
 import io.metersphere.base.domain.Project;
+import io.metersphere.base.domain.ProjectExample;
 import io.metersphere.base.mapper.ProjectMapper;
+import io.metersphere.commons.exception.MSException;
 import io.metersphere.user.SessionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,6 +20,16 @@ public class ProjectService {
     private ProjectMapper projectMapper;
 
     public Project addProject(Project project) {
+        if (StringUtils.isBlank(project.getName())) {
+            MSException.throwException("Project name cannot be null");
+        }
+        ProjectExample example = new ProjectExample();
+        example.createCriteria()
+                .andWorkspaceIdEqualTo(SessionUtils.getCurrentWorkspaceId())
+                .andNameEqualTo(project.getName());
+        if (projectMapper.countByExample(example) > 0) {
+            MSException.throwException("The project name already exists");
+        }
         project.setId(UUID.randomUUID().toString());
         long createTime = System.currentTimeMillis();
         project.setCreateTime(createTime);
diff --git a/backend/src/main/java/io/metersphere/service/WorkspaceService.java b/backend/src/main/java/io/metersphere/service/WorkspaceService.java
index 8741962410..a5788652c3 100644
--- a/backend/src/main/java/io/metersphere/service/WorkspaceService.java
+++ b/backend/src/main/java/io/metersphere/service/WorkspaceService.java
@@ -32,6 +32,13 @@ public class WorkspaceService {
 
         long currentTime = System.currentTimeMillis();
         if (StringUtils.isBlank(workspace.getId())) {
+            WorkspaceExample example = new WorkspaceExample();
+            example.createCriteria()
+                    .andOrganizationIdEqualTo(SessionUtils.getCurrentOrganizationId())
+                    .andNameEqualTo(workspace.getName());
+            if (workspaceMapper.countByExample(example) > 0) {
+                MSException.throwException("The workspace name already exists");
+            }
             workspace.setId(UUID.randomUUID().toString()); // 设置ID
             workspace.setCreateTime(currentTime);
             workspace.setUpdateTime(currentTime); // 首次 update time