Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev

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

@@ -13,7 +13,9 @@ import io.metersphere.controller.request.organization.QueryOrgMemberRequest;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.dto.UserRoleDTO;
 import io.metersphere.service.UserService;
+import io.metersphere.user.SessionUser;
 import io.metersphere.user.SessionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
@@ -51,6 +53,17 @@ public class UserController {
         userService.updateUser(user);
     }
 
+    /**
+     * 修改登录用户信息
+     */
+    @PostMapping("/update/currentuser")
+    public UserDTO updateCurrentUser(@RequestBody User user) {
+        SessionUser sessionUser = SessionUtils.getUser();
+        BeanUtils.copyProperties(user, sessionUser);
+        userService.updateUser(user);
+        return SessionUtils.getUser();
+    }
+
     @GetMapping("/role/list/{userId}")
     public List<Role> getUserRolesList(@PathVariable(value = "userId") String userId) {
         return userService.getUserRolesList(userId);

frontend/src/performance/components/router/router.js

@@ -12,6 +12,7 @@ import Member from "../settings/Member";
 import TestResourcePool from "../settings/TestResourcePool";
 import MsProject from "../project/MsProject";
 import OrganizationWorkspace from "../settings/OrganizationWorkspace";
+import PersonSetting from "../settings/PersonSetting";
 
 Vue.use(VueRouter);
 
@@ -58,6 +59,10 @@ const router = new VueRouter({
           path: 'organizationworkspace',
           component: OrganizationWorkspace,
         },
+        {
+          path: 'personsetting',
+          component: PersonSetting
+        },
         {
           path: 'member',
           component: Member

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

+<template>
+  <div v-loading="result.loading">
+    <el-card>
+
+      <div slot="header">
+        <el-row type="flex" justify="space-between" align="middle">
+          <span class="title">个人信息</span>
+        </el-row>
+      </div>
+
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column prop="id" label="ID"/>
+        <el-table-column prop="name" label="用户名" width="120"/>
+        <el-table-column prop="email" label="邮箱"/>
+        <el-table-column prop="phone" label="电话"/>
+        <el-table-column prop="createTime" label="创建时间" width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button @click="edit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-dialog title="修改个人信息" :visible.sync="updateVisible" width="30%" :destroy-on-close="true" @close="closeFunc">
+        <el-form :model="form" label-position="left" label-width="100px" size="small" :rules="rule" ref="updateUserForm">
+          <el-form-item label="ID" prop="id">
+            <el-input v-model="form.id" autocomplete="off" :disabled="true"/>
+          </el-form-item>
+          <el-form-item label="用户名" prop="name">
+            <el-input v-model="form.name" autocomplete="off"/>
+          </el-form-item>
+          <el-form-item label="邮箱" prop="email">
+            <el-input v-model="form.email" autocomplete="off"/>
+          </el-form-item>
+          <el-form-item label="电话" prop="phone">
+            <el-input v-model="form.phone" autocomplete="off"/>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="updateUser('updateUserForm')" size="medium">修改</el-button>
+        </span>
+      </el-dialog>
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import Cookies from 'js-cookie';
+  import {TokenKey} from "../../../common/constants";
+
+  export default {
+    data() {
+      return {
+        result: {},
+        updateVisible: false,
+        tableData: [],
+        updatePath: '/user/update/currentuser',
+        form: {},
+        rule: {
+          name: [
+            {required: true, message: '请输入姓名', trigger: 'blur'},
+            { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' },
+            {
+              required: true,
+              pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9.·-]+$/,
+              message: '姓名不支持特殊字符',
+              trigger: 'blur'
+            }
+          ],
+          phone: [
+            {
+              required: false,
+              pattern: '^1(3|4|5|7|8)\\d{9}$',
+              message: '手机号码格式不正确！',
+              trigger: 'blur'
+            }
+          ],
+          email: [
+            { required: true, message: '请输入邮箱', trigger: 'blur' },
+            {
+              required: true,
+              pattern: /^([A-Za-z0-9_\-.])+@([A-Za-z0-9]+\.)+[A-Za-z]{2,6}$/,
+              message: '邮箱格式不正确！',
+              trigger: 'blur'
+            }
+          ]
+        }
+      }
+    },
+    name: "PersonSetting",
+    created() {
+      this.initTableData();
+    },
+    methods: {
+      currentUser: () => {
+        let user = Cookies.get(TokenKey);
+        return JSON.parse(user);
+      },
+      edit(row) {
+        this.updateVisible = true;
+        this.form = row;
+      },
+      updateUser(updateUserForm) {
+        this.$refs[updateUserForm].validate(valide => {
+          if (valide) {
+            this.result = this.$post(this.updatePath, this.form,response => {
+              this.$message({
+                type: 'success',
+                message: '修改成功!'
+              });
+              Cookies.set(TokenKey, response.data);
+              this.updateVisible = false;
+              this.initTableData();
+              window.location.reload();
+            });
+          } else {
+            return false;
+          }
+        })
+      },
+      initTableData() {
+        this.result = this.$get("/user/info/" + this.currentUser().id, response => {
+          let data = response.data;
+          let dataList = [];
+          dataList[0] = data;
+          this.tableData = dataList;
+        })
+      },
+      closeFunc() {
+        this.form = {};
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -33,7 +33,7 @@
         <font-awesome-icon class="icon" :icon="['far', 'user']" size="lg"/>
         <span>个人</span>
       </template>
-      <el-menu-item>个人设置</el-menu-item>
+      <el-menu-item index="/setting/personsetting">个人设置</el-menu-item>
     </el-submenu>
 
   </el-menu>