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

2020-06-04 16:41:14 +08:00 · 2020-06-04 16:41:14 +08:00 · 79c7ac49a6
parent 7d95c69637 d4d09ccf0d
commit 79c7ac49a6
18 changed files with 206 additions and 48 deletions
--- a/backend/src/main/java/io/metersphere/controller/LoginController.java
+++ b/backend/src/main/java/io/metersphere/controller/LoginController.java
@ -1,9 +1,9 @@
 package io.metersphere.controller;

 import io.metersphere.base.domain.UserRole;
-import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.dto.UserDTO;
+import io.metersphere.i18n.Translator;
 import io.metersphere.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@ -64,22 +64,22 @@ public class LoginController {
                // 返回 userDTO
                return ResultHolder.success(subject.getSession().getAttribute("user"));
            } else {
-                return ResultHolder.error("login fail");
+                return ResultHolder.error(Translator.get("login_fail"));
            }
        } catch (ExcessiveAttemptsException e) {
-            msg = "excessive attempts";
+            msg = "excessive_attempts";
        } catch (LockedAccountException e) {
-            msg = "the user has been locked.";
+            msg = "user_locked";
        } catch (DisabledAccountException e) {
-            msg = "the user has been disabled. ";
+            msg = "user_has_been_disabled ";
        } catch (ExpiredCredentialsException e) {
-            msg = "user expires. ";
+            msg = "user_expires. ";
        } catch (AuthenticationException e) {
            msg = e.getMessage();
        } catch (UnauthorizedException e) {
-            msg = "not authorized. " + e.getMessage();
+            msg = "not_authorized" + e.getMessage();
        }
-        return ResultHolder.error(msg);
+        return ResultHolder.error(Translator.get(msg));
    }

    @GetMapping(value = "/signout")
--- a/backend/src/main/java/io/metersphere/controller/SystemParameterController.java
+++ b/backend/src/main/java/io/metersphere/controller/SystemParameterController.java
@ -2,10 +2,7 @@ package io.metersphere.controller;

 import io.metersphere.base.domain.SystemParameter;
 import io.metersphere.service.SystemParameterService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
 import java.util.HashMap;
@ -27,4 +24,9 @@ public class SystemParameterController {
        SystemParameterService.testConnection(hashMap);
    }

+    @GetMapping("/version")
+    public String getVersion() {
+        return SystemParameterService.getVersion();
+    }
+
 }
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@ -83,7 +83,9 @@ public class SystemParameterService {
        } catch (MessagingException e) {
            MSException.throwException(Translator.get("connection_failed"));
        }
+    }

-
+    public String getVersion() {
+        return System.getenv("MS_VERSION");
    }
 }
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@ -100,4 +100,8 @@ api_test_name_already_exists=Test name already exists
 password_is_incorrect=Incorrect password
 user_not_exist=user does not exist：
 user_has_been_disabled=the user has been disabled. 
-excessive_attempts=Excessive attempts
+excessive_attempts=Excessive attempts
+user_locked=the user has been locked.
+user_expires=user expires.
+not_authorized=not authorized.
+login_fail=Login fail
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@ -103,5 +103,9 @@ password_is_incorrect=密码不正确
 user_not_exist=用户不存在：
 user_has_been_disabled=用户已被禁用
 excessive_attempts=操作频繁
-user_has_been_locked
+user_locked=用户被锁定
+user_expires=用户过期
+not_authorized=未经授权
+
+

--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@ -101,3 +101,7 @@ password_is_incorrect=密碼不正確
 user_not_exist=用戶不存在：
 user_has_been_disabled.=用戶已被禁用
 excessive_attempts=操作頻繁
+user_locked=用戶被鎖定
+user_expires=用戶過期
+not_authorized=未經授權。
+login_fail=登入失敗
--- a/frontend/package.json
+++ b/frontend/package.json
@ -11,6 +11,7 @@
    "@ckeditor/ckeditor5-build-classic": "^18.0.0",
    "@ckeditor/ckeditor5-vue": "^1.0.1",
    "@fortawesome/fontawesome-svg-core": "^1.2.26",
+    "@fortawesome/free-brands-svg-icons": "^5.13.0",
    "@fortawesome/free-regular-svg-icons": "^5.12.0",
    "@fortawesome/free-solid-svg-icons": "^5.12.0",
    "@fortawesome/vue-fontawesome": "^0.1.9",
--- a/frontend/src/business/components/common/head/AboutUs.vue
+++ b/frontend/src/business/components/common/head/AboutUs.vue
@ -0,0 +1,109 @@
+<template>
+  <el-dialog
+    :title="$t('commons.about_us')"
+    :visible.sync="dialogVisible"
+    width="20%">
+
+    <el-row>
+      <el-col >
+        <el-link :underline="false" :href="websiteUrl">
+          <img class="logo" src="../../../../assets/favicon-彩色.png"/>
+        </el-link>
+        <el-link class="url" :href="websiteUrl" >
+          <span>{{websiteUrl}}</span>
+        </el-link>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col>
+        <div class="github">
+          <el-link :underline="false" :href="githubUrl">
+            <font-awesome-icon class="github-icon" :icon="['fab', 'github-square']"/>
+          </el-link>
+        </div>
+        <el-link class="url" :href="githubUrl">
+          <span>{{githubUrl}}</span>
+        </el-link>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col class="version">
+        <span>版本:</span> &nbsp;
+        <span>{{version}}</span>
+      </el-col>
+    </el-row>
+
+  </el-dialog>
+
+</template>
+
+<script>
+    export default {
+      name: "AboutUs",
+      data() {
+        return{
+          dialogVisible: false,
+          githubUrl: 'https://github.com/metersphere/metersphere',
+          websiteUrl: 'https://github.com/metersphere/metersphere',
+          version: '1.0.1'
+        }
+      },
+      created() {
+        this.getVersion();
+      },
+      methods: {
+        open() {
+          this.dialogVisible = true;
+        },
+        getVersion() {
+          this.$get('/system/version', response => {
+            this.version = response.data;
+          });
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+  .logo {
+    height: 30px;
+    line-height: 30px;
+    vertical-align:middle
+  }
+
+  .version {
+    height: 30px;
+    line-height: 30px;
+    margin-left: 5px;
+  }
+
+  .github-icon {
+    font-size: 20px;
+    margin-left: 5px;
+  }
+
+  .github {
+    height: 30px;
+    width: 30px;
+    line-height: 30px;
+    display: inline-block;
+  }
+
+
+  .el-row {
+    margin-bottom: 3%;
+  }
+
+  .logo:hover{
+    color: deepskyblue;
+  }
+
+  .url {
+    margin-left: 5px;
+  }
+
+
+</style>
--- a/frontend/src/business/components/common/head/HeaderUser.vue
+++ b/frontend/src/business/components/common/head/HeaderUser.vue
@ -7,16 +7,21 @@
      <el-dropdown-menu>
        <el-dropdown-item command="personal">{{$t('commons.personal_information')}}</el-dropdown-item>
        <el-dropdown-item command="logout">{{$t('commons.exit_system')}}</el-dropdown-item>
+        <el-dropdown-item command="about">{{$t('commons.about_us')}} <i class="el-icon-info"/></el-dropdown-item>
      </el-dropdown-menu>
    </template>
+
+    <about-us ref="aboutUs"/>
  </el-dropdown>
 </template>

 <script>
  import {getCurrentUser} from "../../../../common/js/utils";
+  import AboutUs from "./AboutUs";

  export default {
    name: "MsUser",
+    components: {AboutUs},
    computed: {
      currentUser: () => {
        return getCurrentUser();
@ -35,6 +40,9 @@
              window.location.href = "/login";
            });
            break;
+          case "about":
+            this.$refs.aboutUs.open();
+            break;
          default:
            break;
        }
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@ -78,7 +78,7 @@
        <el-form-item :label="$t('commons.phone')" prop="phone">
          <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
        </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
          <el-select v-model="form.roleIds" multiple :placeholder="$t('role.please_choose_role')" class="select-width">
            <el-option
              v-for="item in form.allroles"
@ -175,7 +175,7 @@
        // 编辑使填充角色信息
        this.$set(this.form, 'roleIds', roleIds);
      },
-      updateOrgMember() {
+      updateOrgMember(formName) {
        let param = {
          id: this.form.id,
          name: this.form.name,
@ -184,11 +184,15 @@
          roleIds: this.form.roleIds,
          organizationId: this.currentUser().lastOrganizationId
        }
-        this.result = this.$post("/organization/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.updateVisible = false;
-          this.initTableData();
-        });
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/organization/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.updateVisible = false;
+              this.initTableData();
+            });
+          }
+        })
      },
      del(row) {
        this.$confirm(this.$t('member.remove_member'), '', {
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@ -125,7 +125,7 @@
        <el-form-item :label="$t('commons.phone')" prop="phone">
          <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
        </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
          <el-select v-model="memberForm.roleIds" multiple :placeholder="$t('role.please_choose_role')"
                     class="select-width">
            <el-option
@ -366,7 +366,7 @@
          this.$info(this.$t('commons.remove_cancel'));
        });
      },
-      updateOrgMember() {
+      updateOrgMember(formName) {
        let param = {
          id: this.memberForm.id,
          name: this.memberForm.name,
@ -375,11 +375,15 @@
          roleIds: this.memberForm.roleIds,
          workspaceId: this.currentWorkspaceRow.id
        }
-        this.result = this.$post("/workspace/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.dialogWsMemberUpdateVisible = false;
-          this.cellClick(this.currentWorkspaceRow);
-        });
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/workspace/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.dialogWsMemberUpdateVisible = false;
+              this.cellClick(this.currentWorkspaceRow);
+            });
+          }
+        })
      },
      buildPagePath(path) {
        return path + "/" + this.dialogCurrentPage + "/" + this.dialogPageSize;
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@ -145,7 +145,7 @@
        <el-form-item :label="$t('commons.phone')" prop="phone">
          <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
        </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
          <el-select v-model="memberForm.roleIds" multiple :placeholder="$t('role.please_choose_role')"
                     class="select-width">
            <el-option
@ -427,7 +427,7 @@
          }
        });
      },
-      updateOrgMember() {
+      updateOrgMember(formName) {
        let param = {
          id: this.memberForm.id,
          name: this.memberForm.name,
@ -436,10 +436,14 @@
          roleIds: this.memberForm.roleIds,
          organizationId: this.currentRow.id
        }
-        this.result = this.$post("/organization/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.dialogOrgMemberUpdateVisible = false;
-          this.cellClick(this.currentRow);
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/organization/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.dialogOrgMemberUpdateVisible = false;
+              this.cellClick(this.currentRow);
+            });
+          }
        });
      },
    }
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@ -164,7 +164,7 @@
        <el-form-item :label="$t('commons.phone')" prop="phone">
          <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
        </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
          <el-select v-model="memberForm.roleIds" multiple :placeholder="$t('role.please_choose_role')"
                     class="select-width">
            <el-option
@ -405,7 +405,7 @@
          this.$info(this.$t('commons.remove_cancel'));
        });
      },
-      updateWorkspaceMember() {
+      updateWorkspaceMember(formName) {
        let param = {
          id: this.memberForm.id,
          name: this.memberForm.name,
@ -414,10 +414,14 @@
          roleIds: this.memberForm.roleIds,
          workspaceId: this.currentWorkspaceRow.id
        }
-        this.result = this.$post("/workspace/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.dialogWsMemberUpdateVisible = false;
-          this.cellClick(this.currentWorkspaceRow);
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/workspace/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.dialogWsMemberUpdateVisible = false;
+              this.cellClick(this.currentWorkspaceRow);
+            });
+          }
        });
      },
    },
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@ -79,7 +79,7 @@
        <el-form-item :label="$t('commons.phone')" prop="phone">
          <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
        </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
          <el-select v-model="form.roleIds" multiple :placeholder="$t('role.please_choose_role')" class="select-width">
            <el-option
              v-for="item in form.allroles"
@ -197,7 +197,7 @@
        // 编辑使填充角色信息
        this.$set(this.form, 'roleIds', roleIds);
      },
-      updateWorkspaceMember() {
+      updateWorkspaceMember(formName) {
        let param = {
          id: this.form.id,
          name: this.form.name,
@ -206,10 +206,14 @@
          roleIds: this.form.roleIds,
          workspaceId: this.currentUser().lastWorkspaceId
        }
-        this.result = this.$post("/workspace/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.updateVisible = false;
-          this.initTableData();
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/workspace/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.updateVisible = false;
+              this.initTableData();
+            });
+          }
        });
      },
      create() {
--- a/frontend/src/common/js/icon.js
+++ b/frontend/src/common/js/icon.js
@ -1,11 +1,12 @@
 import {library} from '@fortawesome/fontawesome-svg-core'
 import {fas} from '@fortawesome/free-solid-svg-icons'
 import {far} from '@fortawesome/free-regular-svg-icons'
+import { fab } from '@fortawesome/free-brands-svg-icons'
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'

 export default {
  install(Vue) {
-    library.add(fas, far);
+    library.add(fas, far, fab);
    Vue.component('font-awesome-icon', FontAwesomeIcon);
  }
 }
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@ -4,6 +4,7 @@ export default {
    'organization': 'Organization',
    'setting': 'Setting',
    'project': 'Project',
+    'about_us': 'About Us',
    current_project: 'Current Project',
    'name': 'Name',
    'description': 'Description',
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@ -4,6 +4,7 @@ export default {
    'organization': '组织',
    'setting': '设置',
    'project': '项目',
+    'about_us': '关于',
    current_project: '当前项目',
    'name': '名称',
    'description': '描述',
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@ -4,6 +4,7 @@ export default {
    'organization': '組織',
    'setting': '設置',
    'project': '項目',
+    'about_us': '關於',
    current_project: '當前項目',
    'name': '名稱',
    'description': '描述',