diff --git a/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/CommunicationServer.java b/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/CommunicationServer.java
index fb9d1f6a8523b69884248c33611cdbc2341bc6bd..ba7fee0ffd53164e8ec813c576af2ec5c9b73c18 100644
--- a/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/CommunicationServer.java
+++ b/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/CommunicationServer.java
@@ -25,6 +25,7 @@ public class CommunicationServer {
     private ChatChannelInitializer chatChannelInitializer;
 
     public void  run(int port) throws Exception {
+        System.out.println("聊天服务启动成功端口为:"+port);
         EventLoopGroup bossGroup = new NioEventLoopGroup(2);
         EventLoopGroup workerGroup = new NioEventLoopGroup(15);
         try {
diff --git a/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/handler/nettyService/HasChannelChatService.java b/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/handler/nettyService/HasChannelChatService.java
index 948a146579af7b593bfd47c22487d4511ef87105..afdd8fc8ed741b5bd004ed73fcaa66f691e6a8f8 100644
--- a/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/handler/nettyService/HasChannelChatService.java
+++ b/mobile-app/src/main/java/com/ruoyi/chat/LongConnection/handler/nettyService/HasChannelChatService.java
@@ -62,21 +62,14 @@ public class HasChannelChatService {
             TextMsg textMsg = mapper.convertValue(chatDTO.getMessage(), new TypeReference<TextMsg>() {
             });
             ChatRecord chatrecord = ChatRecord.ChatRecordReaded(senderId, chatDTO.getReceiverId(), textMsg.getText(), chatDTO.getMsgType());
-            CountDownLatch countDownLatch = new CountDownLatch(1);
-            AsyncManager.me().execute(new TimerTask() {
-                @SneakyThrows
-                @Override
-                public void run() {
-                    TextMsgVo msgVo = dozerMapper.map(chatrecord, TextMsgVo.class);
-                    SocketChannel channel = LongConnectionUtil.getChannelById(chatDTO.getReceiverId());
-                    channel.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.RECEIVE_MSG, new ReceiveMsgVo(chatDTO.getMsgType(), msgVo))));
-                    ctx.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.SEND_SUCCESS,
-                            new SendMsgVo(chatDTO.getChatId(), msgVo))));
-                    countDownLatch.countDown();
-                }
-            });
-            countDownLatch.await();
             mclass.chatrecordService.save(chatrecord);
+            TextMsgVo msgVo = dozerMapper.map(chatrecord, TextMsgVo.class);
+            SocketChannel channel = LongConnectionUtil.getChannelById(chatDTO.getReceiverId());
+            channel.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.RECEIVE_MSG, new ReceiveMsgVo(chatDTO.getMsgType(), msgVo))));
+            ctx.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.SEND_SUCCESS,
+                    new SendMsgVo(chatDTO.getChatId(), msgVo))));
+
+
 
         }));
         map.put(LongConnectionChatDTO.FILE, ((ctx, chatDTO, senderId) -> {
@@ -84,23 +77,19 @@ public class HasChannelChatService {
             FileMsg fileMsg = mapper.convertValue(chatDTO.getMessage(), FileMsg.class);
             String url = mclass.minioService.setFile(fileMsg);
             CountDownLatch countDownLatch = new CountDownLatch(1);
-            AsyncManager.me().execute(new TimerTask() {
-                @SneakyThrows
-                @Override
-                public void run() {
-                    SocketChannel channel = LongConnectionUtil.getChannelById(chatDTO.getReceiverId());
-                    FileMsgVo fileMsgVo = dozerMapper.map(chatrecord, FileMsgVo.class);
-                    fileMsgVo.setFileName(fileMsg.getFileName()).setUrl(url);
-                    channel.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.RECEIVE_MSG, new ReceiveMsgVo(chatDTO.getMsgType(), fileMsgVo))));
-                    ctx.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.SEND_SUCCESS, new SendMsgVo(chatDTO.getChatId(), fileMsgVo))));
-                    countDownLatch.countDown();
-                }
-            });
+
             countDownLatch.await();
             mclass.chatrecordService.save(chatrecord);
             ChatFileData ChatFileData = new ChatFileData(chatrecord.getMsgId(), url, fileMsg.getFileName());
             mclass.ChatFileDataService.save(ChatFileData);
 
+            SocketChannel channel = LongConnectionUtil.getChannelById(chatDTO.getReceiverId());
+            FileMsgVo fileMsgVo = dozerMapper.map(chatrecord, FileMsgVo.class);
+            fileMsgVo.setFileName(fileMsg.getFileName()).setUrl(url);
+            channel.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.RECEIVE_MSG, new ReceiveMsgVo(chatDTO.getMsgType(), fileMsgVo))));
+            ctx.writeAndFlush(LongConnectionMsgUtil.ObjectToWSTextResult(new ReturnMsgVo(ReturnMsgVo.SEND_SUCCESS, new SendMsgVo(chatDTO.getChatId(), fileMsgVo))));
+            countDownLatch.countDown();
+
         }));
     }
 
diff --git a/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java b/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java
index f75e50d6c7551803a5b390c3e00c9b339795729a..f8148d38d17f259fe1188ffdf4616f7d2792a08d 100644
--- a/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java
+++ b/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -70,7 +71,7 @@ public class ChatFileData implements Serializable {
     private LocalDateTime updatedTime;
 
     @TableField(value = "deleted",fill = FieldFill.INSERT)
-    @TableLogic
+    @TableLogic(value = "F",delval = "T")
     private String deleted;
 
 
diff --git a/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatRecord.java b/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatRecord.java
index cdcdc249df08423f1bf349ab56f1c8f3b4cd883c..ca487ce1251393105f57e7193a1973b902462618 100644
--- a/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatRecord.java
+++ b/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatRecord.java
@@ -101,7 +101,7 @@ public class ChatRecord implements Serializable {
      * 逻辑删除
      */
     @TableField(value = "deleted",fill = FieldFill.INSERT)
-    @TableLogic
+    @TableLogic(value = "F",delval = "T")
     private String deleted;
 
     @TableId(value = "msg_id", type = IdType.ASSIGN_UUID)
diff --git a/mobile-app/src/main/java/com/ruoyi/chat/service/impl/ChatServiceImpl.java b/mobile-app/src/main/java/com/ruoyi/chat/service/impl/ChatServiceImpl.java
index 69e2dbef4f1d5e2205191c78f87a1d4adaccd412..610b51f066f58a054781109fd408121c14b967d7 100644
--- a/mobile-app/src/main/java/com/ruoyi/chat/service/impl/ChatServiceImpl.java
+++ b/mobile-app/src/main/java/com/ruoyi/chat/service/impl/ChatServiceImpl.java
@@ -1,12 +1,18 @@
 package com.ruoyi.chat.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.chat.LongConnection.model.ReceiveMsgVo;
+import com.ruoyi.chat.LongConnection.model.ReturnMsgVo;
+import com.ruoyi.chat.LongConnection.model.SendMsgVo;
+import com.ruoyi.chat.LongConnection.model.msg.TextMsgVo;
 import com.ruoyi.chat.LongConnection.util.LongConnectionMsgUtil;
 import com.ruoyi.chat.LongConnection.util.LongConnectionUtil;
 import com.ruoyi.chat.ab.entity.ChatRecord;
 import com.ruoyi.chat.ab.service.IChatRecordService;
 import com.ruoyi.chat.service.IChatService;
+import com.ruoyi.framework.manager.AsyncManager;
 import io.netty.channel.socket.SocketChannel;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +20,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 
@@ -59,17 +66,21 @@ public class ChatServiceImpl implements IChatService {
         //System.out.println(set);
         final CountDownLatch latch = new CountDownLatch(set.size());
         List<ChatRecord> rs = new ArrayList<>();
+
         for (String item :
                 set) {
-            Runnable runnable = () -> {
-                QueryWrapper<ChatRecord> wrapper1 = new QueryWrapper<>();
-                wrapper1.eq("receiver_id", item).and(i -> i.eq("sender_id", id)).or().eq("sender_id", item).and(i -> i.eq("receiver_id", id)).
-                        select("receiver_id", "sender_id", "message", "msg_type", "rb", "CREATED_TIME", "msg_id").orderByDesc("CREATED_TIME").last("limit 3");
-                List<ChatRecord> list = chatrecordService.list(wrapper1);
-                rs.addAll(list);
-                latch.countDown();
-            };
-            runnable.run();
+            AsyncManager.me().execute(new TimerTask() {
+                @SneakyThrows
+                @Override
+                public void run() {
+                    QueryWrapper<ChatRecord> wrapper1 = new QueryWrapper<>();
+                    wrapper1.eq("receiver_id", item).and(i -> i.eq("sender_id", id)).or().eq("sender_id", item).and(i -> i.eq("receiver_id", id)).
+                            select("receiver_id", "sender_id", "message", "msg_type", "rb", "CREATED_TIME", "msg_id").orderByDesc("CREATED_TIME").last("limit 3");
+                    List<ChatRecord> list = chatrecordService.list(wrapper1);
+                    rs.addAll(list);
+                    latch.countDown();
+                }
+            });
         }
         try {
             latch.await();
@@ -82,6 +93,8 @@ public class ChatServiceImpl implements IChatService {
     @Override
     public List<ChatRecord> getFiveHisChats(String msgId, String user1, String user2) {
         //System.out.println(user1 + "" + user2);
+        chatrecordService.save(new ChatRecord().setMessage("text"));
+        chatrecordService.list();
         LocalDateTime lastTime = chatrecordService.getById(msgId).getCreatedTime();
         QueryWrapper<ChatRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("receiver_id", user1).and(i -> i.eq("sender_id", user2)).
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b29a30027fb5727220e3452459fd207934769ae1..aad72e529e702d00bec0ba8bb83e62ecebef3dac 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -105,7 +105,7 @@ accessToken:
   accessExcludes: /login,/register,/captchaImage
   # 匹配连接
 #  accessUrlPatterns:
-  accessUrlPatterns: /chat/*,/app/user/api/*,/file/api/*,/classes/api/*
+  accessUrlPatterns: /app/user/api/*,/file/api/*,/classes/api/*,/chat/*
 
 
 # MyBatis配置
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/data/filter/second/AccessFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/data/filter/second/AccessFilter.java
index a177f8c796ed797ed433368541c437593210e624..30499883d76f2879cbc9f2b3b2552eb402cd6dbb 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/data/filter/second/AccessFilter.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/data/filter/second/AccessFilter.java
@@ -24,11 +24,8 @@ public class AccessFilter implements Filter {
         String appId = request.getParameter("appId");
         String token = request.getParameter("token");
         String currentTime = request.getParameter("timeStamp");
-
         ApiAuthencator apiAuthencator = GetBeanUtil.getBean(ApiAuthencator.class);
-
         int code = apiAuthencator.auth(new ApiRequest(token,Long.valueOf(appId),Long.valueOf(currentTime)),request,response);
-
         if(code != 1){
             return;
         }
diff --git a/ruoyi-ui/2021.12.7dist.zip b/ruoyi-ui/2021.12.7dist.zip
new file mode 100644
index 0000000000000000000000000000000000000000..e2a2593bf5eb1aee5e0eff0e9f0395d85d581f48
Binary files /dev/null and b/ruoyi-ui/2021.12.7dist.zip differ
diff --git a/ruoyi-ui/src/api/app/user.js b/ruoyi-ui/src/api/app/user.js
new file mode 100644
index 0000000000000000000000000000000000000000..c48696cf06238371b619f7f6227093e7d909b300
--- /dev/null
+++ b/ruoyi-ui/src/api/app/user.js
@@ -0,0 +1,121 @@
+import request from '@/utils/request'
+import { praseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/app/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/app/user/' + praseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/app/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/app/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/app/user/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出用户
+export function exportUser(query) {
+  return request({
+    url: '/app/user/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/app/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/app/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/app/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/app/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/app/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+
+
+// 下载用户导入模板
+export function importTemplate() {
+  return request({
+    url: '/app/user/importTemplate',
+    method: 'get'
+  })
+}
+
diff --git a/ruoyi-ui/src/views/app/user/authRole.vue b/ruoyi-ui/src/views/app/user/authRole.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2a569e5d56bd1cb84ef273879e0a8ad48425810e
--- /dev/null
+++ b/ruoyi-ui/src/views/app/user/authRole.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="app-container">
+    <h4 class="form-header h4">基本信息</h4>
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-row>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="用户昵称" prop="nickName">
+            <el-input v-model="form.nickName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="登录账号" prop="phonenumber">
+            <el-input  v-model="form.userName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <h4 class="form-header h4">角色信息</h4>
+    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+      <el-table-column label="序号" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+      <el-table-column label="角色编号" align="center" prop="roleId" />
+      <el-table-column label="角色名称" align="center" prop="roleName" />
+      <el-table-column label="权限字符" align="center" prop="roleKey" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+
+    <el-form label-width="100px">
+      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+        <el-button @click="close()">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getAuthRole, updateAuthRole } from "@/api/app/user";
+
+export default {
+  name: "AuthRole",
+  data() {
+    return {
+       // 遮罩层
+      loading: true,
+      // 分页信息
+      total: 0,
+      pageNum: 1,
+      pageSize: 10,
+      // 选中角色编号
+      roleIds:[],
+      // 角色信息
+      roles: [],
+      // 用户信息
+      form: {}
+    };
+  },
+  created() {
+    const userId = this.$route.params && this.$route.params.userId;
+    if (userId) {
+      this.loading = true;
+      getAuthRole(userId).then((response) => {
+        this.form = response.user;
+        this.roles = response.roles;
+        this.total = this.roles.length;
+        this.$nextTick(() => {
+          this.roles.forEach((row) => {
+            if (row.flag) {
+              this.$refs.table.toggleRowSelection(row);
+            }
+          });
+        });
+        this.loading = false;
+      });
+    }
+  },
+  methods: {
+    /** 单击选中行数据 */
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.roleIds = selection.map((item) => item.roleId);
+    },
+    // 保存选中的数据编号
+    getRowKey(row) {
+      return row.roleId;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      const userId = this.form.userId;
+      const roleIds = this.roleIds.join(",");
+      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+        this.$modal.msgSuccess("授权成功");
+        this.close();
+      });
+    },
+    /** 关闭按钮 */
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/app/user" });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/app/user/index.vue b/ruoyi-ui/src/views/app/user/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b266383840faed8e634b8f1f3adcd75a7b231a8a
--- /dev/null
+++ b/ruoyi-ui/src/views/app/user/index.vue
@@ -0,0 +1,648 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--班级数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="classesName"
+            placeholder="请输入班级名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="classesOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="学号" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入学号"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              size="small"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['app:user:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['app:user:edit']"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['app:user:remove']"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['app:user:import']"
+            >导入</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :loading="exportLoading"
+              @click="handleExport"
+              v-hasPermi="['app:user:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="学号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="班级" align="center" key="classesName" prop="classes.classesName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-value="0"
+                inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['app:user:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['app:user:remove']"
+              >删除</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['app:user:resetPwd', 'app:user:edit']">
+                <span class="el-dropdown-link">
+                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                    v-hasPermi="['app:user:resetPwd']">重置密码</el-dropdown-item>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属班级" prop="classesId">
+              <treeselect v-model="form.classesId" :options="classesOptions" :show-count="true" placeholder="请选择归属班级" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="学号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入学号" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择">
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/app/user";
+import { getToken } from "@/utils/auth";
+import { treeselect } from "@/api/system/classes";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "User",
+  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 班级树选项
+      classesOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 班级名称
+      classesName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/app/user/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        classesId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `学号`, visible: true },
+        { key: 2, label: `姓名`, visible: true },
+        { key: 3, label: `班级`, visible: true },
+        { key: 4, label: `手机号码`, visible: true },
+        { key: 5, label: `状态`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
+      ],
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "学号不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '学号长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选班级树
+    classesName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询班级下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.classesOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.classesId = data.id;
+      this.getList();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        return changeUserStatus(row.userId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: undefined,
+        classesId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: []
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
+        case "handleAuthRole":
+          this.handleAuthRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getTreeselect();
+      getUser().then(response => {
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.open = true;
+        this.title = "添加用户";
+        this.form.password = this.initPassword;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      const userId = row.userId || this.ids;
+      getUser(userId).then(response => {
+        this.form = response.data;
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.form.postIds = response.postIds;
+        this.form.roleIds = response.roleIds;
+        this.open = true;
+        this.title = "修改用户";
+        this.form.password = "";
+      });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+      }).then(({ value }) => {
+          resetUserPwd(row.userId, value).then(response => {
+            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          });
+        }).catch(() => {});
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+        return delUser(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {
+        this.exportLoading = true;
+        return exportUser(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.$download.name(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/app/user/profile/index.vue b/ruoyi-ui/src/views/app/user/profile/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..dcfb82dab1d7f12dbc3182226ef671205281d5a9
--- /dev/null
+++ b/ruoyi-ui/src/views/app/user/profile/index.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>个人信息</span>
+          </div>
+          <div>
+            <div class="text-center">
+              <userAvatar :user="user" />
+            </div>
+            <ul class="list-group list-group-striped">
+              <li class="list-group-item">
+                <svg-icon icon-class="user" />学号
+                <div class="pull-right">{{ user.userName }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="phone" />手机号码
+                <div class="pull-right">{{ user.phonenumber }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="email" />用户邮箱
+                <div class="pull-right">{{ user.email }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="tree" />所属班级
+                <div class="pull-right" v-if="user.classes">{{ user.classes.classesName }} / {{ postGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="peoples" />所属角色
+                <div class="pull-right">{{ roleGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="date" />创建日期
+                <div class="pull-right">{{ user.createTime }}</div>
+              </li>
+            </ul>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="18" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>基本资料</span>
+          </div>
+          <el-tabs v-model="activeTab">
+            <el-tab-pane label="基本资料" name="userinfo">
+              <userInfo :user="user" />
+            </el-tab-pane>
+            <el-tab-pane label="修改密码" name="resetPwd">
+              <resetPwd :user="user" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import userInfo from "./userInfo";
+import resetPwd from "./resetPwd";
+import { getUserProfile } from "@/api/app/user";
+
+export default {
+  name: "Profile",
+  components: { userInfo, resetPwd },
+  data() {
+    return {
+      user: {},
+      roleGroup: {},
+      postGroup: {},
+      activeTab: "userinfo"
+    };
+  },
+  created() {
+    this.getUser();
+  },
+  methods: {
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data;
+      });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/app/user/profile/resetPwd.vue b/ruoyi-ui/src/views/app/user/profile/resetPwd.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8b94228fa797706e2974da60e1faa68146ec396c
--- /dev/null
+++ b/ruoyi-ui/src/views/app/user/profile/resetPwd.vue
@@ -0,0 +1,72 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="旧密码" prop="oldPassword">
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="新密码" prop="newPassword">
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="确认密码" prop="confirmPassword">
+      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserPwd } from "@/api/app/user";
+
+export default {
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      test: "1test",
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined
+      },
+      // 表单校验
+      rules: {
+        oldPassword: [
+          { required: true, message: "旧密码不能为空", trigger: "blur" }
+        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+        ],
+        confirmPassword: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
+            response => {
+              this.$modal.msgSuccess("修改成功");
+            }
+          );
+        }
+      });
+    },
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/index" });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/app/user/profile/userInfo.vue b/ruoyi-ui/src/views/app/user/profile/userInfo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..329a675c13acc3f3100e2521168db87a110092f3
--- /dev/null
+++ b/ruoyi-ui/src/views/app/user/profile/userInfo.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="姓名" prop="nickName">
+      <el-input v-model="user.nickName" maxlength="30" />
+    </el-form-item> 
+    <el-form-item label="手机号码" prop="phonenumber">
+      <el-input v-model="user.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="邮箱" prop="email">
+      <el-input v-model="user.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="性别">
+      <el-radio-group v-model="user.sex">
+        <el-radio label="0">男</el-radio>
+        <el-radio label="1">女</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserProfile } from "@/api/app/user";
+
+export default {
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        email: [
+          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserProfile(this.user).then(response => {
+            this.$modal.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/index" });
+    }
+  }
+};
+</script>