From 7cd0ed098e0b8a5671ef216a44466ec959dfb8b7 Mon Sep 17 00:00:00 2001
From: zhaonengzhi <zhaonengzhi@foxmail.com>
Date: Sat, 21 Aug 2021 15:02:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0,=E5=9F=BA=E6=9C=AC=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E7=AD=89=E5=8A=9F=E8=83=BD=20Signed-off-by:=20zhaonengzhi=20<z?=
 =?UTF-8?q?haonengzhi@foxmail.com>=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20doc/springbootv2.sql=20=E5=B7=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/common?=
 =?UTF-8?q?/base/BaseController.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20src/main/java/com/fc/v2/common/conf/V2Config.?=
 =?UTF-8?q?java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/m?=
 =?UTF-8?q?ain/java/com/fc/v2/common/domain/AjaxResult.java=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/?=
 =?UTF-8?q?v2/common/interceptor/MyWebAppConfigurer.java=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/?=
 =?UTF-8?q?v2/controller/AdminController.java=20=E5=B7=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/contro?=
 =?UTF-8?q?ller/admin/SysUserController.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/mapper/auto/TSy?=
 =?UTF-8?q?sUserMapper.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20src/main/java/com/fc/v2/model/auto/TSysUser.java=20?=
 =?UTF-8?q?=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/jav?=
 =?UTF-8?q?a/com/fc/v2/service/ITSysUserService.java=20=E5=B7=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/servic?=
 =?UTF-8?q?e/impl/TSysUserServiceImpl.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/shiro/service/M?=
 =?UTF-8?q?yShiroRealm.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20src/main/resources/application.yml=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/resources/my?=
 =?UTF-8?q?batis/auto/TsysUserMapper.xml=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20src/main/resources/templates/admin/index.h?=
 =?UTF-8?q?tml=20=E5=B7=B2=E6=B7=BB=E5=8A=A0=20=20=20=20=20=20=20=20src/ma?=
 =?UTF-8?q?in/java/com/fc/v2/util/file/FileTypeUtils.java=20=E5=B7=B2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=20=20=20=20=20=20=20src/main/java/com/fc/?=
 =?UTF-8?q?v2/util/file/FileUploadUtils.java=20=E5=B7=B2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/util/file/FileU?=
 =?UTF-8?q?tils.java=20=E5=B7=B2=E6=B7=BB=E5=8A=A0=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?src/main/java/com/fc/v2/util/file/MimeTypeUtils.java=20?=
 =?UTF-8?q?=E5=B7=B2=E6=B7=BB=E5=8A=A0=20=20=20=20=20=20=20=20src/main/res?=
 =?UTF-8?q?ources/templates/admin/sysUser/person.html=20=E5=B7=B2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20=20=20=20=20=20=20=20src/main/resources/templates/a?=
 =?UTF-8?q?dmin/sysUser/uploadProfile.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/springbootv2.sql                          |  13 +-
 .../com/fc/v2/common/base/BaseController.java |  11 +
 .../java/com/fc/v2/common/conf/V2Config.java  |  37 ++-
 .../com/fc/v2/common/domain/AjaxResult.java   |  14 +
 .../interceptor/MyWebAppConfigurer.java       |  10 +-
 .../com/fc/v2/controller/AdminController.java |  29 +-
 .../controller/admin/SysUserController.java   | 118 ++++++++
 .../com/fc/v2/mapper/auto/TSysUserMapper.java |   9 +-
 .../java/com/fc/v2/model/auto/TSysUser.java   |  67 +++++
 .../com/fc/v2/service/ITSysUserService.java   |   8 -
 .../v2/service/impl/TSysUserServiceImpl.java  |  13 +-
 .../com/fc/v2/shiro/service/MyShiroRealm.java |  21 +-
 .../com/fc/v2/util/file/FileTypeUtils.java    |  77 ++++++
 .../com/fc/v2/util/file/FileUploadUtils.java  | 198 +++++++++++++
 .../java/com/fc/v2/util/file/FileUtils.java   | 199 ++++++++++++++
 .../com/fc/v2/util/file/MimeTypeUtils.java    |  59 ++++
 src/main/resources/application.yml            |   2 +
 .../resources/mybatis/auto/TsysUserMapper.xml |  57 ++--
 src/main/resources/templates/admin/index.html |  63 +++--
 .../templates/admin/sysUser/person.html       | 259 ++++++++++++++++++
 .../admin/sysUser/uploadProfile.html          | 127 +++++++++
 21 files changed, 1283 insertions(+), 108 deletions(-)
 create mode 100644 src/main/java/com/fc/v2/util/file/FileTypeUtils.java
 create mode 100644 src/main/java/com/fc/v2/util/file/FileUploadUtils.java
 create mode 100644 src/main/java/com/fc/v2/util/file/FileUtils.java
 create mode 100644 src/main/java/com/fc/v2/util/file/MimeTypeUtils.java
 create mode 100644 src/main/resources/templates/admin/sysUser/person.html
 create mode 100644 src/main/resources/templates/admin/sysUser/uploadProfile.html

diff --git a/doc/springbootv2.sql b/doc/springbootv2.sql
index c9d4ba3..dbadf86 100644
--- a/doc/springbootv2.sql
+++ b/doc/springbootv2.sql
@@ -1114,7 +1114,12 @@ CREATE TABLE `t_sys_user`  (
   `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户账号',
   `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户密码',
   `nickname` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '昵称',
-  `dep_id` int(11) NULL DEFAULT NULL COMMENT '部门id',
+  `user_type` varchar(2) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '00' COMMENT '用户类型（00系统用户 01注册用户）',
+  `email` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '用户邮箱',
+  `phonenumber` varchar(11) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '手机号码',
+  `sex` char(1) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）',
+  `avatar`  varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '头像路径',
+  `dep_id` bigint(30) NULL DEFAULT NULL COMMENT '部门id',
   `pos_id` bigint(30) NULL DEFAULT NULL COMMENT '岗位id',
   `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '创建者',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
@@ -1122,13 +1127,13 @@ CREATE TABLE `t_sys_user`  (
   `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '用户表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of t_sys_user
 -- ----------------------------
-INSERT INTO `t_sys_user` VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '管理员', 2, 410792368778907648, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_sys_user` VALUES (433236479427350528, 'fuce', '21232f297a57a5a743894a0e4a801fc3', '付册', 2, 410792443127140352, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_sys_user` VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '管理员', '00', 'test@foxmail.com', '18688888888', '0', '',2, 410792368778907648, 'admin', SYSDATE(), NULL, NULL, NULL);
+INSERT INTO `t_sys_user` VALUES (433236479427350528, 'fuce', '21232f297a57a5a743894a0e4a801fc3', '付册', '00', 'test@foxmail.com', '18688888888', '0', '',2, 410792443127140352, 'admin', SYSDATE(), NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for t_test
diff --git a/src/main/java/com/fc/v2/common/base/BaseController.java b/src/main/java/com/fc/v2/common/base/BaseController.java
index b943759..ea253cc 100644
--- a/src/main/java/com/fc/v2/common/base/BaseController.java
+++ b/src/main/java/com/fc/v2/common/base/BaseController.java
@@ -119,6 +119,17 @@ public class BaseController {
         return AjaxResult.success(message);
     }
 
+    /**
+     * 返回object数据
+     *
+     * @param code
+     * @param data
+     * @return
+     */
+    public AjaxResult success(int code, String message, Object data) {
+        return AjaxResult.success(code, message, data);
+    }
+
     /**
      * 返回失败消息
      *
diff --git a/src/main/java/com/fc/v2/common/conf/V2Config.java b/src/main/java/com/fc/v2/common/conf/V2Config.java
index 0dfa0c4..752572c 100644
--- a/src/main/java/com/fc/v2/common/conf/V2Config.java
+++ b/src/main/java/com/fc/v2/common/conf/V2Config.java
@@ -30,6 +30,9 @@ public class V2Config
     private String demoEnabled;
     /** 滚动验证码 **/
     private Boolean rollVerification;
+    /** 文件路径 **/
+    private String profile;
+
 	public String getName() {
 		return name;
 	}
@@ -84,6 +87,36 @@ public class V2Config
 	public void setRollVerification(Boolean rollVerification) {
 		this.rollVerification = rollVerification;
 	}
-    
-	
+
+	public String getProfile() {
+		return profile;
+	}
+
+	public void setProfile(String profile) {
+		this.profile = profile;
+	}
+
+	/**
+	 * 获取头像上传路径
+	 */
+	public String getAvatarPath()
+	{
+		return this.profile + "/avatar";
+	}
+
+	/**
+	 * 获取下载路径
+	 */
+	public String getDownloadPath()
+	{
+		return this.profile + "/download/";
+	}
+
+	/**
+	 * 获取上传路径
+	 */
+	public String getUploadPath()
+	{
+		return this.profile+ "/upload";
+	}
 }
diff --git a/src/main/java/com/fc/v2/common/domain/AjaxResult.java b/src/main/java/com/fc/v2/common/domain/AjaxResult.java
index a6c0f37..959b5cf 100644
--- a/src/main/java/com/fc/v2/common/domain/AjaxResult.java
+++ b/src/main/java/com/fc/v2/common/domain/AjaxResult.java
@@ -79,6 +79,20 @@ public class AjaxResult extends HashMap<String, Object>
     {
         return AjaxResult.success("操作成功");
     }
+
+    /**
+     * 返回成功消息
+     *
+     * @return 成功消息
+     */
+    public static AjaxResult success(int code, String msg, Object value)
+    {
+        AjaxResult json = new AjaxResult();
+        json.put("msg", msg);
+        json.put("code", code);
+        json.put("data", value);
+        return json;
+    }
     
     public static AjaxResult successData(int code, Object value){
     	 AjaxResult json = new AjaxResult();
diff --git a/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java b/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java
index 2ae7083..4a243e6 100644
--- a/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java
+++ b/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java
@@ -1,5 +1,8 @@
 package com.fc.v2.common.interceptor;
 
+import com.fc.v2.common.conf.V2Config;
+import com.fc.v2.util.file.FileUploadUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -22,6 +25,9 @@ public class MyWebAppConfigurer  extends  WebMvcConfigurationSupport  {
 	
 	//private static Logger logger=LoggerFactory.getLogger(WebMvcConfigurationSupport.class);
 
+	@Autowired
+	private V2Config v2Config;
+
 	/** 解决跨域问题 **/
 	@Override
 	public void addCorsMappings(CorsRegistry registry){
@@ -81,8 +87,10 @@ public class MyWebAppConfigurer  extends  WebMvcConfigurationSupport  {
 //        
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+		/** 本地文件上传路径 */
+		registry.addResourceHandler(FileUploadUtils.RESOURCE_PREFIX+ "/**").addResourceLocations("file:" + v2Config.getProfile() + "/");
 
-        super.addResourceHandlers(registry);
+		super.addResourceHandlers(registry);
 
     }
 	/** 默认静态资源处理器 **/
diff --git a/src/main/java/com/fc/v2/controller/AdminController.java b/src/main/java/com/fc/v2/controller/AdminController.java
index 758fa0c..8efaff1 100644
--- a/src/main/java/com/fc/v2/controller/AdminController.java
+++ b/src/main/java/com/fc/v2/controller/AdminController.java
@@ -37,22 +37,23 @@ import java.util.List;
 @Controller
 @RequestMapping("/admin")
 public class AdminController extends BaseController {
+
     private static Logger logger = LoggerFactory.getLogger(AdminController.class);
 
     private String prefix = "admin";
 
-    @ApiOperation(value = "首页" , notes = "首页")
-    @GetMapping({"" , "/index"})
+    @ApiOperation(value = "首页", notes = "首页")
+    @GetMapping({"", "/index"})
     public String index(HttpServletRequest request) {
-        request.getSession().setAttribute("sessionUserName" , ShiroUtils.getUser().getNickname());
+        request.getSession().setAttribute("user", sysUserService.selectTSysUserById(ShiroUtils.getUserId()));
         // 获取公告信息
         List<TSysNotice> notices = sysNoticeService.getuserNoticeNotRead(ShiroUtils.getUser(), 0);
-        request.getSession().setAttribute("notices" , notices);
+        request.getSession().setAttribute("notices", notices);
         return prefix + "/index";
     }
 
 
-    @ApiOperation(value = "获取登录用户菜单栏" , notes = "获取登录用户菜单栏")
+    @ApiOperation(value = "获取登录用户菜单栏", notes = "获取登录用户菜单栏")
     @GetMapping("/getUserMenu")
     @ResponseBody
     public List<SysMenu> getUserMenu() {
@@ -67,7 +68,7 @@ public class AdminController extends BaseController {
      * @param request
      * @return
      */
-    @ApiOperation(value = "请求到登陆界面" , notes = "请求到登陆界面")
+    @ApiOperation(value = "请求到登陆界面", notes = "请求到登陆界面")
     @GetMapping("/login")
     public String login(ModelMap modelMap) {
         try {
@@ -75,7 +76,7 @@ public class AdminController extends BaseController {
                 return "redirect:/" + prefix + "/index";
             } else {
                 System.out.println("--进行登录验证..验证开始");
-                modelMap.put("RollVerification" , v2Config.getRollVerification());
+                modelMap.put("RollVerification", v2Config.getRollVerification());
                 System.out.println("V2Config.getRollVerification()>>>" + v2Config.getRollVerification());
                 return "login";
             }
@@ -96,7 +97,7 @@ public class AdminController extends BaseController {
      * @param request
      * @return
      */
-    @ApiOperation(value = "用户登陆验证" , notes = "用户登陆验证")
+    @ApiOperation(value = "用户登陆验证", notes = "用户登陆验证")
     @PostMapping("/login")
     @ResponseBody
     public AjaxResult login(TSysUser user, String captcha, RedirectAttributes redirectAttributes, boolean rememberMe,
@@ -178,7 +179,7 @@ public class AdminController extends BaseController {
      * @author fuce
      * @Date 2020年12月7日 上午12:54:28
      */
-    @ApiOperation(value = "手机登录" , notes = "手机登录")
+    @ApiOperation(value = "手机登录", notes = "手机登录")
     @PostMapping("/API/login")
     @ResponseBody
     public AjaxResult APIlogin(TSysUser user, boolean rememberMe, HttpServletRequest request) {
@@ -251,7 +252,7 @@ public class AdminController extends BaseController {
      *
      * @return
      */
-    @ApiOperation(value = "退出登陆" , notes = "退出登陆")
+    @ApiOperation(value = "退出登陆", notes = "退出登陆")
     @GetMapping("/Loginout")
     @ResponseBody
     public AjaxResult LoginOut(HttpServletRequest request, HttpServletResponse response) {
@@ -263,7 +264,7 @@ public class AdminController extends BaseController {
     }
 
     /**** 页面测试 ****/
-    @ApiOperation(value = "404页面" , notes = "404页面")
+    @ApiOperation(value = "404页面", notes = "404页面")
     @GetMapping("Out404")
     public String Out404(HttpServletRequest request, HttpServletResponse response) {
 
@@ -271,13 +272,13 @@ public class AdminController extends BaseController {
     }
 
     @GetMapping("Out403")
-    @ApiOperation(value = "403页面" , notes = "403页面")
+    @ApiOperation(value = "403页面", notes = "403页面")
     public String Out403(HttpServletRequest request, HttpServletResponse response) {
 
         return "redirect:/error/403";
     }
 
-    @ApiOperation(value = "500页面" , notes = "500页面")
+    @ApiOperation(value = "500页面", notes = "500页面")
     @GetMapping("Out500")
     public String Out500(HttpServletRequest request, HttpServletResponse response) {
 
@@ -291,7 +292,7 @@ public class AdminController extends BaseController {
      * @param response
      * @return
      */
-    @ApiOperation(value = "权限测试跳转页面" , notes = "权限测试跳转页面")
+    @ApiOperation(value = "权限测试跳转页面", notes = "权限测试跳转页面")
     @GetMapping("Outqx")
     @RequiresPermissions("system:user:asd")
     public String Outqx(HttpServletRequest request, HttpServletResponse response) {
diff --git a/src/main/java/com/fc/v2/controller/admin/SysUserController.java b/src/main/java/com/fc/v2/controller/admin/SysUserController.java
index 221a077..eb258c3 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysUserController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysUserController.java
@@ -3,6 +3,7 @@ package com.fc.v2.controller.admin;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fc.v2.common.conf.V2Config;
 import com.fc.v2.common.domain.ResultTable;
 import com.fc.v2.model.auto.TSysDepartment;
 import com.fc.v2.model.auto.TSysPosition;
@@ -10,6 +11,9 @@ import com.fc.v2.model.auto.TSysRole;
 import com.fc.v2.model.auto.TSysUser;
 import com.fc.v2.service.ITSysDepartmentService;
 import com.fc.v2.service.ITSysPositionService;
+import com.fc.v2.shiro.util.ShiroUtils;
+import com.fc.v2.util.MD5Util;
+import com.fc.v2.util.file.FileUploadUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -22,6 +26,7 @@ import com.fc.v2.model.custom.RoleVo;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 用户Controller
@@ -49,6 +54,12 @@ public class SysUserController extends BaseController {
     @Autowired
     private ITSysPositionService positionService;
 
+    /**
+     * v2配置
+     */
+    @Autowired
+    private V2Config config;
+
     /**
      * 展示跳转页面
      *
@@ -210,4 +221,111 @@ public class SysUserController extends BaseController {
     public AjaxResult editPwdSave(TSysUser tsysUser) {
         return toAjax(sysUserService.updateUserPassword(tsysUser));
     }
+
+    /**
+     * 个人详细信息
+     *
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "个人详细信息", notes = "个人详细信息")
+    @GetMapping("/user/person")
+    public String userInfo(ModelMap map){
+        TSysUser tSysUser = ShiroUtils.getUser();
+        map.put("user", tSysUser);
+        map.put("fuce", config);
+        return prefix + "/person.html";
+    }
+
+    /**
+     * 跳转上传页面
+     *
+     * @return
+     */
+    @ApiOperation(value = "跳转上传页面", notes = "跳转上传页面")
+    @GetMapping("/user/uploadProfile")
+    public String uploadProfile(){
+        return prefix + "/uploadProfile.html";
+    }
+
+    /**
+     * 上传头像
+     *
+     * @param file
+     * @return
+     */
+    @ApiOperation(value = "上传头像", notes = "上传头像")
+    @PostMapping("/user/updateAvatar")
+    @ResponseBody
+    public AjaxResult updateAvatar(MultipartFile file){
+
+        TSysUser tSysUser = ShiroUtils.getUser();
+
+        try {
+            if (!file.isEmpty()){
+                String avatar =  FileUploadUtils.upload(config.getProfile(), config.getAvatarPath(), file);
+                tSysUser.setAvatar(avatar);
+                if (sysUserService.updateTSysUser(tSysUser) > 0){
+                    ShiroUtils.setUser(sysUserService.selectTSysUserById(tSysUser.getId()));
+                    return success(200,"操作成功", avatar);
+                }
+            }
+            return error();
+        }catch (Exception e){
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 修改保存用户
+     *
+     * @param tsysUser
+     * @return
+     */
+    @Log(title = "修改保存用户", action = "update")
+    @ApiOperation(value = "修改保存用户", notes = "修改保存用户")
+    @PostMapping("/user/update")
+    @ResponseBody
+    public AjaxResult update(TSysUser tsysUser) {
+        if (sysUserService.updateTSysUser(tsysUser) > 0){
+            ShiroUtils.setUser(sysUserService.selectTSysUserById(tsysUser.getId()));
+            return success();
+        }
+        return error();
+    }
+
+    /**
+     * 重置密码
+     *
+     * @param tsysUser
+     * @return
+     */
+    @Log(title = "重置密码", action = "update")
+    @ApiOperation(value = "重置密码", notes = "重置密码")
+    @PostMapping("/user/resetPwd")
+    @ResponseBody
+    public AjaxResult resetPwd(TSysUser tsysUser, String oldPassword, String newPassword, String confirmPassword) {
+
+        if (!MD5Util.encode(newPassword).equals(MD5Util.encode(confirmPassword))){
+            return error("两次密码输入不一致");
+        }
+
+        tsysUser = sysUserService.selectTSysUserById(tsysUser.getId());
+
+        if (!MD5Util.encode(oldPassword).equals(tsysUser.getPassword())){
+            return error("修改密码失败，旧密码错误");
+        }
+
+        if (MD5Util.encode(newPassword).equals(tsysUser.getPassword())){
+            return error("新密码不能与旧密码相同");
+        }
+
+        tsysUser.setPassword(MD5Util.encode(newPassword));
+        if (sysUserService.updateTSysUser(tsysUser) > 0){
+            ShiroUtils.setUser(sysUserService.selectTSysUserById(tsysUser.getId()));
+            return success();
+        }
+
+        return error("修改密码异常，请联系管理员");
+    }
 }
diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
index e6847ff..52aa761 100644
--- a/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
+++ b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
@@ -4,7 +4,6 @@ package com.fc.v2.mapper.auto;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fc.v2.model.auto.TSysUser;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * 用户Mapper接口
@@ -13,14 +12,14 @@ import org.apache.ibatis.annotations.Select;
  * @date 2021-08-05
  */
 public interface TSysUserMapper extends BaseMapper<TSysUser> {
+
 	/**
-	 * 根据用户名字查询用户
+	 * 查询用户
 	 *
-	 * @param username
+	 * @param id
 	 * @return
 	 */
-	@Select("select id, username, password, nickname, dep_id, pos_id, create_by, create_time, update_by, update_time, remark from t_sys_user where username = #{username}")
-	public TSysUser queryUserName(String username);
+	public TSysUser selectTSysUserById(Long id);
 
 	/**
 	 * 查询用户列表
diff --git a/src/main/java/com/fc/v2/model/auto/TSysUser.java b/src/main/java/com/fc/v2/model/auto/TSysUser.java
index 183faf1..47bd132 100644
--- a/src/main/java/com/fc/v2/model/auto/TSysUser.java
+++ b/src/main/java/com/fc/v2/model/auto/TSysUser.java
@@ -40,6 +40,26 @@ public class TSysUser extends BaseEntity
     @ApiModelProperty(value = "昵称")
     private String nickname;
 
+    /** 用户类型 */
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+
+    /** 用户邮箱 */
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @ApiModelProperty(value = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 0=男,1=女,2=未知*/
+    @ApiModelProperty(value = "用户性别")
+    private String sex;
+
+    /** 用户头像 */
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+
     /** 部门id */
     @ApiModelProperty(value = "部门id")
     private Long depId;
@@ -127,6 +147,46 @@ public class TSysUser extends BaseEntity
         return posId;
     }
 
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -134,6 +194,11 @@ public class TSysUser extends BaseEntity
             .append("username", getUsername())
             .append("password", getPassword())
             .append("nickname", getNickname())
+            .append("userType", getUserType())
+            .append("email", getEmail())
+            .append("phonenumber", getPhonenumber())
+            .append("sex", getSex())
+            .append("avatar", getAvatar())
             .append("depId", getDepId())
             .append("posId", getPosId())
             .append("createBy", getCreateBy())
@@ -143,4 +208,6 @@ public class TSysUser extends BaseEntity
             .append("remark", getRemark())
             .toString();
     }
+
+
 }
diff --git a/src/main/java/com/fc/v2/service/ITSysUserService.java b/src/main/java/com/fc/v2/service/ITSysUserService.java
index b7ecc32..396fe70 100644
--- a/src/main/java/com/fc/v2/service/ITSysUserService.java
+++ b/src/main/java/com/fc/v2/service/ITSysUserService.java
@@ -114,12 +114,4 @@ public interface ITSysUserService extends IService<TSysUser> {
 	 * @return
 	 */
 	int updateUserPassword(TSysUser tsysUser);
-
-	/**
-	 * 根据用户名称查询
-	 *
-	 * @param username
-	 * @return
-	 */
-	TSysUser queryUserName(String username);
 }
diff --git a/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
index 48d79d0..1390bb8 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
@@ -53,7 +53,7 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
      */
     @Override
     public TSysUser selectTSysUserById(Long id) {
-        return this.baseMapper.selectById(id);
+        return tSysUserMapper.selectTSysUserById(id);
     }
 
     /**
@@ -229,15 +229,4 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
         tsysUser.setPassword(MD5Util.encode(tsysUser.getPassword()));
         return this.updateTSysUser(tsysUser);
     }
-
-    /**
-     * 根据用户名称查询
-     *
-     * @param username
-     * @return
-     */
-    @Override
-    public TSysUser queryUserName(String username) {
-        return this.tSysUserMapper.queryUserName(username);
-    }
 }
diff --git a/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java b/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java
index e920932..8853263 100644
--- a/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java
+++ b/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java
@@ -20,6 +20,7 @@ import org.apache.shiro.subject.PrincipalCollection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,7 +40,7 @@ public class MyShiroRealm extends AuthorizingRealm {
     @Autowired
     private ITSysPermissionService permissionService;
 
-	//角色dao
+    //角色dao
     @Autowired
     private ITSysRoleService roleService;
 
@@ -60,16 +61,22 @@ public class MyShiroRealm extends AuthorizingRealm {
         String password = new String((char[]) token.getCredentials());
         // 通过username从数据库中查找 User对象，如果找到，没找到.
         // 实际项目中，这里可以根据实际情况做缓存，如果不做，Shiro自己也是有时间间隔机制，2分钟内不会重复执行该方法
-        TSysUser userInfo = userService.queryUserName(username);
+        TSysUser userInfo = new TSysUser();
+        userInfo.setUsername(username);
+        List<TSysUser> list = userService.selectTSysUserList(userInfo);
 //		System.out.println(userInfo);
 //		System.out.println("----->>userInfo=" + userInfo.getUsername() + "---"+ userInfo.getPassword());
-        if (userInfo == null)
+        if (list == null || list.size() == 0) {
             return null;
-        else {
+        } else {
+            userInfo = list.get(0);
             SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo(
-                    userInfo, // 用户对象
-                    userInfo.getPassword(), // 密码
-                    getName() // realm name
+                    // 用户对象
+                    userInfo,
+                    // 密码
+                    userInfo.getPassword(),
+                    // realm name
+                    getName()
             );
             return authenticationInfo;
         }
diff --git a/src/main/java/com/fc/v2/util/file/FileTypeUtils.java b/src/main/java/com/fc/v2/util/file/FileTypeUtils.java
new file mode 100644
index 0000000..5a18ee1
--- /dev/null
+++ b/src/main/java/com/fc/v2/util/file/FileTypeUtils.java
@@ -0,0 +1,77 @@
+package com.fc.v2.util.file;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+
+/**
+ * 文件类型工具类
+ *
+ * @author zhaonz
+ */
+public class FileTypeUtils
+{
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     * 
+     * @param file 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(File file)
+    {
+        if (null == file)
+        {
+            return StringUtils.EMPTY;
+        }
+        return getFileType(file.getName());
+    }
+
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     *
+     * @param fileName 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(String fileName)
+    {
+        int separatorIndex = fileName.lastIndexOf(".");
+        if (separatorIndex < 0)
+        {
+            return "";
+        }
+        return fileName.substring(separatorIndex + 1).toLowerCase();
+    }
+
+    /**
+     * 获取文件类型
+     * 
+     * @param photoByte 文件字节码
+     * @return 后缀（不含".")
+     */
+    public static String getFileExtendName(byte[] photoByte)
+    {
+        String strFileExtendName = "JPG";
+        if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+        {
+            strFileExtendName = "GIF";
+        }
+        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+        {
+            strFileExtendName = "JPG";
+        }
+        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+        {
+            strFileExtendName = "BMP";
+        }
+        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+        {
+            strFileExtendName = "PNG";
+        }
+        return strFileExtendName;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fc/v2/util/file/FileUploadUtils.java b/src/main/java/com/fc/v2/util/file/FileUploadUtils.java
new file mode 100644
index 0000000..64beaaf
--- /dev/null
+++ b/src/main/java/com/fc/v2/util/file/FileUploadUtils.java
@@ -0,0 +1,198 @@
+package com.fc.v2.util.file;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.fc.v2.common.exception.file.InvalidExtensionException;
+import com.fc.v2.util.DateUtils;
+import com.fc.v2.util.StringUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * 文件上传工具类
+ * 
+ * @author zhaonz
+ */
+public class FileUploadUtils
+{
+    /**
+     * 默认大小 50M
+     */
+    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+
+    /**
+     * 默认的文件名最大长度 100
+     */
+    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+    /**
+     * 资源映射路径 前缀
+     */
+    public static final String RESOURCE_PREFIX = "/profile";
+
+    /**
+     * 根据文件路径上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @return 文件名称
+     * @throws IOException
+     */
+    public static final String upload(String defaultDir, String baseDir, MultipartFile file) throws IOException
+    {
+        try
+        {
+            return upload(defaultDir, baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+        }
+        catch (Exception e)
+        {
+            throw new IOException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 文件上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @param allowedExtension 上传文件类型
+     * @return 返回上传成功的文件名
+     * @throws Exception 异常
+     */
+    public static final String upload(String defaultDir, String baseDir, MultipartFile file, String[] allowedExtension)
+            throws Exception
+    {
+        int fileNamelength = file.getOriginalFilename().length();
+        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
+        {
+            throw new RuntimeException("文件名称长度超长");
+        }
+
+        assertAllowed(file, allowedExtension);
+
+        String fileName = extractFilename(file);
+
+        File desc = getAbsoluteFile(baseDir, fileName);
+        file.transferTo(desc);
+        String pathFileName = getPathFileName(defaultDir, baseDir, fileName);
+        return pathFileName;
+    }
+
+    /**
+     * 编码文件名
+     */
+    public static final String extractFilename(MultipartFile file)
+    {
+        String fileName = file.getOriginalFilename();
+        String extension = getExtension(file);
+        fileName = DateUtils.datePath() + "/" + IdWorker.getId() + "." + extension;
+        return fileName;
+    }
+
+    private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+    {
+        File desc = new File(uploadDir + File.separator + fileName);
+
+        if (!desc.exists())
+        {
+            if (!desc.getParentFile().exists())
+            {
+                desc.getParentFile().mkdirs();
+            }
+        }
+        return desc;
+    }
+
+    private static final String getPathFileName(String defaultDir, String uploadDir, String fileName) throws IOException
+    {
+        int dirLastIndex = defaultDir.length() + 1;
+        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+        String pathFileName = RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+        return pathFileName;
+    }
+
+    /**
+     * 文件大小校验
+     *
+     * @param file 上传的文件
+     * @return
+     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws InvalidExtensionException
+     */
+    public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+            throws Exception
+    {
+        long size = file.getSize();
+        if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE)
+        {
+            throw new RuntimeException("文件长度超长");
+        }
+
+        String fileName = file.getOriginalFilename();
+        String extension = getExtension(file);
+        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
+        {
+            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+            {
+                throw new RuntimeException("filename:"+fileName + "  extension:" + extension);
+            }
+            else
+            {
+                throw new InvalidExtensionException(allowedExtension, extension, fileName);
+            }
+        }
+
+    }
+
+    /**
+     * 判断MIME类型是否是允许的MIME类型
+     *
+     * @param extension
+     * @param allowedExtension
+     * @return
+     */
+    public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
+    {
+        for (String str : allowedExtension)
+        {
+            if (str.equalsIgnoreCase(extension))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 获取文件名的后缀
+     * 
+     * @param file 表单文件
+     * @return 后缀名
+     */
+    public static final String getExtension(MultipartFile file)
+    {
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (StringUtils.isEmpty(extension))
+        {
+            extension = MimeTypeUtils.getExtension(file.getContentType());
+        }
+        return extension;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fc/v2/util/file/FileUtils.java b/src/main/java/com/fc/v2/util/file/FileUtils.java
new file mode 100644
index 0000000..bef5e19
--- /dev/null
+++ b/src/main/java/com/fc/v2/util/file/FileUtils.java
@@ -0,0 +1,199 @@
+package com.fc.v2.util.file;
+
+import com.fc.v2.util.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 文件处理工具类
+ * 
+ * @author zhaonz
+ */
+public class FileUtils
+{
+    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
+
+    /**
+     * 输出指定文件的byte数组
+     * 
+     * @param filePath 文件路径
+     * @param os 输出流
+     * @return
+     */
+    public static void writeBytes(String filePath, OutputStream os) throws IOException
+    {
+        FileInputStream fis = null;
+        try
+        {
+            File file = new File(filePath);
+            if (!file.exists())
+            {
+                throw new FileNotFoundException(filePath);
+            }
+            fis = new FileInputStream(file);
+            byte[] b = new byte[1024];
+            int length;
+            while ((length = fis.read(b)) > 0)
+            {
+                os.write(b, 0, length);
+            }
+        }
+        catch (IOException e)
+        {
+            throw e;
+        }
+        finally
+        {
+            if (os != null)
+            {
+                try
+                {
+                    os.close();
+                }
+                catch (IOException e1)
+                {
+                    e1.printStackTrace();
+                }
+            }
+            if (fis != null)
+            {
+                try
+                {
+                    fis.close();
+                }
+                catch (IOException e1)
+                {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 删除文件
+     * 
+     * @param filePath 文件
+     * @return
+     */
+    public static boolean deleteFile(String filePath)
+    {
+        boolean flag = false;
+        File file = new File(filePath);
+        // 路径为文件且不为空则进行删除
+        if (file.isFile() && file.exists())
+        {
+            file.delete();
+            flag = true;
+        }
+        return flag;
+    }
+
+    /**
+     * 文件名称验证
+     * 
+     * @param filename 文件名称
+     * @return true 正常 false 非法
+     */
+    public static boolean isValidFilename(String filename)
+    {
+        return filename.matches(FILENAME_PATTERN);
+    }
+
+    /**
+     * 检查文件是否可下载
+     * 
+     * @param resource 需要下载的文件
+     * @return true 正常 false 非法
+     */
+    public static boolean checkAllowDownload(String resource)
+    {
+        // 禁止目录上跳级别
+        if (StringUtils.contains(resource, ".."))
+        {
+            return false;
+        }
+
+        // 检查允许下载的文件规则
+        if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
+        {
+            return true;
+        }
+
+        // 不在允许下载的文件规则
+        return false;
+    }
+
+    /**
+     * 下载文件名重新编码
+     * 
+     * @param request 请求对象
+     * @param fileName 文件名
+     * @return 编码后的文件名
+     */
+    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
+    {
+        final String agent = request.getHeader("USER-AGENT");
+        String filename = fileName;
+        if (agent.contains("MSIE"))
+        {
+            // IE浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+            filename = filename.replace("+", " ");
+        }
+        else if (agent.contains("Firefox"))
+        {
+            // 火狐浏览器
+            filename = new String(fileName.getBytes(), "ISO8859-1");
+        }
+        else if (agent.contains("Chrome"))
+        {
+            // google浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+        }
+        else
+        {
+            // 其它浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+        }
+        return filename;
+    }
+
+    /**
+     * 下载文件名重新编码
+     *
+     * @param response 响应对象
+     * @param realFileName 真实文件名
+     * @return
+     */
+    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
+    {
+        String percentEncodedFileName = percentEncode(realFileName);
+
+        StringBuilder contentDispositionValue = new StringBuilder();
+        contentDispositionValue.append("attachment; filename=")
+                .append(percentEncodedFileName)
+                .append(";")
+                .append("filename*=")
+                .append("utf-8''")
+                .append(percentEncodedFileName);
+
+        response.setHeader("Content-disposition", contentDispositionValue.toString());
+    }
+
+    /**
+     * 百分号编码工具方法
+     *
+     * @param s 需要百分号编码的字符串
+     * @return 百分号编码后的字符串
+     */
+    public static String percentEncode(String s) throws UnsupportedEncodingException
+    {
+        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
+        return encode.replaceAll("\\+", "%20");
+    }
+}
diff --git a/src/main/java/com/fc/v2/util/file/MimeTypeUtils.java b/src/main/java/com/fc/v2/util/file/MimeTypeUtils.java
new file mode 100644
index 0000000..8b7b08b
--- /dev/null
+++ b/src/main/java/com/fc/v2/util/file/MimeTypeUtils.java
@@ -0,0 +1,59 @@
+package com.fc.v2.util.file;
+
+/**
+ * 媒体类型工具类
+ * 
+ * @author zhaonz
+ */
+public class MimeTypeUtils
+{
+    public static final String IMAGE_PNG = "image/png";
+
+    public static final String IMAGE_JPG = "image/jpg";
+
+    public static final String IMAGE_JPEG = "image/jpeg";
+
+    public static final String IMAGE_BMP = "image/bmp";
+
+    public static final String IMAGE_GIF = "image/gif";
+
+    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+
+    public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+
+    public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+            "asf", "rm", "rmvb" };
+
+    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+
+    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+            // 图片
+            "bmp", "gif", "jpg", "jpeg", "png",
+            // word excel powerpoint
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+            // 压缩文件
+            "rar", "zip", "gz", "bz2",
+            // 视频格式
+            "mp4", "avi", "rmvb",
+            // pdf
+            "pdf" };
+
+    public static String getExtension(String prefix)
+    {
+        switch (prefix)
+        {
+            case IMAGE_PNG:
+                return "png";
+            case IMAGE_JPG:
+                return "jpg";
+            case IMAGE_JPEG:
+                return "jpeg";
+            case IMAGE_BMP:
+                return "bmp";
+            case IMAGE_GIF:
+                return "gif";
+            default:
+                return "";
+        }
+    }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7139de5..9ef4e2c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,6 +19,8 @@ fuce:
   demo-enabled: false
   #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
   roll-verification: false
+  # 文件路径 示例（ Windows配置D:/v2/uploadPath，Linux配置 /home/v2/uploadPath）
+  profile: D:/v2/uploadPath
 #tomcat config
 server :
   port : 8080
diff --git a/src/main/resources/mybatis/auto/TsysUserMapper.xml b/src/main/resources/mybatis/auto/TsysUserMapper.xml
index 8e2566f..df95de8 100644
--- a/src/main/resources/mybatis/auto/TsysUserMapper.xml
+++ b/src/main/resources/mybatis/auto/TsysUserMapper.xml
@@ -9,20 +9,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="username"    column="username"    />
         <result property="password"    column="password"    />
         <result property="nickname"    column="nickname"    />
-        <result property="depId"    column="dep_id"    />
-        <result property="posId"    column="pos_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <resultMap type="com.fc.v2.model.auto.TSysUser" id="BaseResultMap">
-        <result property="id"    column="id"    />
-        <result property="username"    column="username"    />
-        <result property="password"    column="password"    />
-        <result property="nickname"    column="nickname"    />
+        <result property="userType"    column="user_type"   />
+        <result property="email"       column="email"       />
+        <result property="phonenumber" column="phonenumber" />
+        <result property="sex"         column="sex"         />
+        <result property="avatar"      column="avatar"      />
         <result property="depId"    column="dep_id"    />
         <result property="posId"    column="pos_id"    />
         <result property="depName"  column="dep_name"  />
@@ -35,23 +26,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSysUserVo">
-        select id, username, password, nickname, dep_id, pos_id, create_by, create_time, update_by, update_time, remark from t_sys_user
+        select id, username, password, nickname, user_type, email, avatar, phonenumber, sex, dep_id, pos_id, create_by, create_time, update_by, update_time, remark
     </sql>
 
-    <select id="selectTSysUserList" resultMap="BaseResultMap" parameterType="com.fc.v2.model.auto.TSysUser">
-        select
-        id,
-        username,
-        password,
-        nickname,
+    <select id="selectTSysUserById" resultMap="TSysUserResult" parameterType="Long">
+        <include refid="selectTSysUserVo"/>
+        ,
+        (select dept_name from t_sys_department dep where dep.id = tsu.dep_id) as dep_name,
+        (select post_name from t_sys_position pos where pos.id = tsu.pos_id) as pos_name
+        from t_sys_user tsu
+        where tsu.id = #{id}
+    </select>
+
+    <select id="selectTSysUserList" resultMap="TSysUserResult" parameterType="com.fc.v2.model.auto.TSysUser">
+        <include refid="selectTSysUserVo"/>
+        ,
         (select dept_name from t_sys_department dep where dep.id = tsu.dep_id) as dep_name,
-        (select post_name from t_sys_position pos where pos.id = tsu.pos_id) as pos_name,
-        dep_id,
-        pos_id
+        (select post_name from t_sys_position pos where pos.id = tsu.pos_id) as pos_name
         from t_sys_user tsu
-        <if test="username != null and username!=''" >
-            where  username= #{username}
-        </if>
+        <where>
+            <if test="username != null  and username != ''"> and tsu.username = #{username}</if>
+            <if test="nickname != null  and nickname != ''"> and tsu.nickname like concat('%', #{nickname}, '%')</if>
+            <if test="userType != null  and userType != ''"> and tsu.user_type = #{userType}</if>
+            <if test="email != null  and email != ''"> and tsu.email = #{email}</if>
+            <if test="phonenumber != null  and phonenumber != ''"> and tsu.phonenumber = #{phonenumber}</if>
+            <if test="sex != null  and sex != ''"> and tsu.sex = #{sex}</if>
+            <if test="avatar != null  and avatar != ''"> and tsu.avatar = #{avatar}</if>
+            <if test="depId != null "> and tsu.dep_id = #{depId}</if>
+            <if test="posId != null "> and tsu.pos_id = #{posId}</if>
+        </where>
         order by id+0 DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/index.html b/src/main/resources/templates/admin/index.html
index bf906dd..23509e0 100644
--- a/src/main/resources/templates/admin/index.html
+++ b/src/main/resources/templates/admin/index.html
@@ -35,12 +35,12 @@
             <li class="layui-nav-item">
                 <!-- 头 像 -->
                 <a href="javascript:;">
-                    <img src="" id="headImg" class="layui-nav-img">
-                    <span th:text="${session.sessionUserName}"></span>
+                    <img th:src="(${#strings.isEmpty(session.user.avatar)}) ? @{/static/admin/images/avatar.jpg} : @{${session.user.avatar}}" th:onerror="this.src='/static/admin/images/avatar.jpg'" id="headImg" class="layui-nav-img">
+                    <span id="nickname" th:text="${session.user.nickname}"></span>
                 </a>
                 <!-- 功 能 菜 单 -->
                 <dl class="layui-nav-child">
-                    <dd><a user-menu-url="/system/user/center" user-menu-id="5555" user-menu-title="基本资料">基本资料</a></dd>
+                    <dd><a id="center" menu-type="2" menu-id="n5" th:menu-url="@{/UserController/user/person}" href="javascript:;">基本资料</a></dd>
                     <dd><a href="javascript:void(0);" class="logout">注销登录</a></dd>
                 </dl>
             </li>
@@ -78,39 +78,46 @@
         let $ = layui.jquery;
         let layer = layui.layer;
         let popup = layui.popup;
+
         admin.render();
 
-        $('#headImg').attr("src",makeHeadImgByUserName([[${session.sessionUserName}]]));
+        $("#menu-msg").click(function () {
+            layui.tab.addTabOnlyByElem("content", {
+                id: $(this).attr("menu-id"),
+                title: "公告展示",
+                url: $(this).attr("menu-url"),
+                close: "允许关闭"
+            });
+        });
 
-         $("#menu-msg").click(function(){
+        $('#center').click(function () {
+            layui.tab.addTabOnlyByElem("content", {
+                id: $(this).attr("menu-id"),
+                title: "基本资料",
+                url: $(this).attr("menu-url"),
+                close: "允许关闭"
+            });
+        });
 
-            layui.tab.addTabOnlyByElem("content",{id:$(this).attr("menu-id"),title:"公告展示",url:$(this).attr("menu-url"),close:"允许关闭"})
-        })
-        
         // 注销实现
-        admin.logout(function(){
-        	 let loading = layer.load();
-        	 $.ajax({
-     			url: rootPath+'/admin/Loginout',
-     			dataType: 'json',
-     			type: 'get',
-     			success: function(result) {
-     				if (result.code==200) {
-     					popup.success(result.msg, function() {
-     						location.href = rootPath+"/";
+        admin.logout(function () {
+            let loading = layer.load();
+            $.ajax({
+                url: rootPath + '/admin/Loginout',
+                dataType: 'json',
+                type: 'get',
+                success: function (result) {
+                    if (result.code == 200) {
+                        popup.success(result.msg, function () {
+                            location.href = rootPath + "/";
                         });
                         return true;
-     				}
-     			}
-     		})
-     		 return true;
-        })
-        			
-		
-        
-
+                    }
+                }
+            });
+            return true;
+        });
     })
-
 </script>
 </body>
 </html>
diff --git a/src/main/resources/templates/admin/sysUser/person.html b/src/main/resources/templates/admin/sysUser/person.html
new file mode 100644
index 0000000..388cd53
--- /dev/null
+++ b/src/main/resources/templates/admin/sysUser/person.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('基本资料')"/>
+    <link rel="stylesheet" th:href="@{/static/admin/css/other/person.css}"/>
+    <style type="text/css">
+        .info-list-item {
+            position: relative;
+            padding-bottom: 8px;
+        }
+
+        .info-list-item > .layui-icon {
+            position: absolute;
+        }
+
+        .info-list-item > p {
+            padding-left: 30px;
+        }
+
+    </style>
+</head>
+<!-- 正文开始 -->
+<div class="pear-container">
+    <div class="layui-row layui-col-space15">
+        <!-- 左 -->
+        <div class="layui-col-sm12 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-body" style="padding: 25px;">
+                    <div class="text-center layui-text">
+                        <div class="user-info-head" id="userAvatar">
+                            <img id="Avatar" src="" width="115px" height="115px" alt=""/>
+                        </div>
+                        <h2 id="nickname" style="padding-top: 20px;" th:text="${user.nickname}"></h2>
+                        <!-- <p style="padding-top: 8px;"></p> -->
+                    </div>
+                    <div class="layui-text" style="padding-top: 30px;">
+                        <div class="info-list-item">
+                            <i class="layui-icon layui-icon-username"></i>
+                            <p id="username" th:text="${user.username}"></p>
+                        </div>
+
+                        <div class="info-list-item">
+                            <i class="layui-icon layui-icon-group"></i>
+                            <p id="depName" th:text="${user.depName}"></p>
+                        </div>
+
+                        <div class="info-list-item">
+                            <i class="layui-icon layui-icon-chart-screen"></i>
+                            <p id="posName" th:text="${user.posName}"></p>
+                        </div>
+
+                        <div class="info-list-item">
+                            <i class="layui-icon layui-icon-cellphone"></i>
+                            <p id="phonenumber" th:text="${user.phonenumber}"></p>
+                        </div>
+
+                        <div class="info-list-item">
+                            <i class="layui-icon layui-icon-email"></i>
+                            <p id="email" th:text="${user.email}"></p>
+                        </div>
+
+                        <div class="info-list-item">
+                            <i class="layui-icon layui-icon-time"></i>
+                            <p th:text="${user.createTime}"></p>
+                        </div>
+                    </div>
+                    <div class="dash"></div>
+                    <h3>标签</h3>
+                    <div class="layui-badge-list" style="padding-top: 6px;">
+                        <span class="layui-badge layui-bg-gray" th:text="${fuce.name}"></span>
+                        <!--<span class="layui-badge layui-bg-gray">Roses</span>-->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 右 -->
+        <div class="layui-col-sm12 layui-col-md9">
+            <div class="layui-card">
+                <div class="layui-card-body layui-text">
+                    <div class="layui-tab layui-tab-brief" lay-filter="userInfoTab">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">基本信息</li>
+                            <li>修改密码</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-form layui-show" lay-filter="userInfoForm">
+                                <div class="layui-form" style="max-width: 600px;padding-top: 25px;" th:object="${user}">
+                                    <input type="hidden" name="id" th:field="${user.id}"/>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">账号:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="username" th:field="${user.username}" class="layui-input" placeholder="请输入账号" lay-verify="required" disabled/>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">用户名称:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="nickname" th:field="${user.nickname}" class="layui-input" placeholder="请输入用户名称" lay-verify="required" required/>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">性别:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="radio" name="sex" value="0" title="男" lay-filter="1" lay-verify="required" required checked>
+                                            <input type="radio" name="sex" value="1" title="女" lay-filter="2" lay-verify="required" required>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">联系电话:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="phonenumber" th:field="${user.phonenumber}" placeholder="请输入手机号码" class="layui-input" lay-verify="required" required/>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">邮箱:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="email" name="email" th:field="${user.email}" class="layui-input" placeholder="请输入邮箱" lay-verify="required|email" required/>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 20px">
+                                        <div class="layui-input-block">
+                                            <button class="pear-btn pear-btn-primary pear-btn-sm" lay-filter="userInfoSubmit" lay-submit>
+                                                <i class="layui-icon layui-icon-ok"></i>
+                                                更新基本信息
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="layui-form layui-tab-item" lay-filter="modify_password">
+                                <div id="form-user-resetPwd" class="layui-form" style="max-width: 400px;padding-top: 25px;" th:object="${user}">
+                                    <input type="hidden" name="id" th:field="${user.id}"/>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">旧密码:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="password" name="oldPassword" class="layui-input" placeholder="请输入旧密码" lay-verify="required" required/>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">新密码:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="password" name="newPassword" class="layui-input" placeholder="请输入新密码" lay-verify="required" required/>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 10px">
+                                        <label class="layui-form-label">确认密码:<span style="color: red;">*</span></label>
+                                        <div class="layui-input-block">
+                                            <input type="password" name="confirmPassword" class="layui-input" placeholder="请确认密码" lay-verify="required" required/>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item" style="padding-top: 20px">
+                                        <div class="layui-input-block">
+                                            <button class="pear-btn pear-btn-primary pear-btn-sm" lay-filter="userPasswdSubmit" lay-submit>
+                                                <i class="layui-icon layui-icon-ok"></i>
+                                                更新密码
+                                            </button>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script>
+    layui.use(['form','jquery', 'element', 'layer'], function () {
+        let element = layui.element;
+        let layer = layui.layer;
+        let $ = layui.jquery;
+        let form = layui.form;
+
+        form.render();
+
+        let MODULE_PATH = "/UserController";
+
+        $("#Avatar").attr("src", parent.layui.$(".layui-nav-img").attr("src"));
+
+        window.callback = function (data) {
+            layer.close(data.index);
+            $("#userAvatar").attr("src", data.newAvatar);
+            parent.layui.$(".layui-nav-img").attr("src", data.newAvatar);
+        }
+
+        $("#userAvatar").click(function () {
+            layer.open({
+                type: 2,
+                title: '更换图片',
+                shade: 0.1,
+                area: ["900px", "500px"],
+                content: MODULE_PATH + '/user/uploadProfile',
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    window['layui-layer-iframe' + index].submitForm();
+                }
+            });
+        });
+
+        //基本信息提交
+        form.on('submit(userInfoSubmit)', function (data) {
+            $.ajax({
+                url: MODULE_PATH +'/user/update',
+                data: data.field,
+                dataType: 'json',
+                type: 'post',
+                async:false,
+                success: function (result) {
+                    if (result.code == 200) {
+                        layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                            $("#username").html(data.field.username);
+                            $("#nickname").html(data.field.nickname);
+                            $("#phonenumber").html(data.field.phonenumber);
+                            $("#email").html(data.field.email);
+                            parent.layui.$("#nickname").text(data.field.nickname);
+                        });
+                    } else {
+                        layer.msg(result.msg, {icon: 2, time: 1000});
+                    }
+                }
+            });
+        });
+
+        //更新密码
+        form.on('submit(userPasswdSubmit)', function (data) {
+            $.ajax({
+                url: MODULE_PATH +'/user/resetPwd',
+                data: data.field,
+                dataType: 'json',
+                type: 'post',
+                async:false,
+                success: function (result) {
+                    if (result.code == 200) {
+                        layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                        });
+                    } else {
+                        layer.msg(result.msg, {icon: 2, time: 1000});
+                    }
+                }
+            });
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/admin/sysUser/uploadProfile.html b/src/main/resources/templates/admin/sysUser/uploadProfile.html
new file mode 100644
index 0000000..60aeea0
--- /dev/null
+++ b/src/main/resources/templates/admin/sysUser/uploadProfile.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('头像上传')"/>
+</head>
+<body class="pear-container">
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-xs9">
+            <div style="height:325px;background-color: rgb(247, 247, 247);">
+                <img id="sourceImage" src="">
+            </div>
+        </div>
+        <div class="layui-col-xs3" style="padding-left:0px;">
+            <div id="previewImage" style="width:210px;height:210px;border: 1px solid rgb(200, 200, 200);border-radius: 50%;overflow:hidden;">
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-input-inline layui-btn-container" style="width: auto;vertical-align:top;">
+                <button class="pear-btn pear-btn-sm pear-btn-primary layui-icon layui-icon-left" cropper-event="rotate" data-option="-15" title="左旋15°"></button>
+                <button class="pear-btn pear-btn-sm pear-btn-primary layui-icon layui-icon-right" cropper-event="rotate" data-option="15" title="右旋15°"></button>
+                <button class="pear-btn pear-btn-sm pear-btn-danger layui-icon layui-icon-refresh" cropper-event="reset" title="重置"></button>
+                <label for="uploadPicture" class="pear-btn pear-btn-sm pear-btn-primary layui-icon layui-icon-upload" title="选择图片"></label>
+                <input class="layui-upload-file" id="uploadPicture" type="file" value="选择图片">
+            </div>
+            <div class="layui-form-mid layui-word-aux">建议:图片的尺寸宽高比为1:1,大小在5m以内。</div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer"/>
+    <script>
+        layui.use(['layer','cropper'], function () {
+            let $ = layui.jquery;
+            let cropper = layui.cropper;
+
+            let MODULE_PATH = "/UserController";
+
+            var options = {
+                aspectRatio: 1 / 1, // 裁剪框比例
+                preview: '#previewImage', // 预览div
+                viewmode: 1
+            };
+            
+            var obj = parent.layui.$("#Avatar").attr("src");
+            $("#sourceImage").attr("src", obj);
+            console.log(parent.layui.$("#Avatar").attr("src"));
+            $("#sourceImage").cropper(options);
+
+            window.submitForm = function () {
+                $("#sourceImage").crossOrigin = 'anonymous';//解决跨域图片问题
+                $("#sourceImage").cropper("getCroppedCanvas", {
+                    width: 280,
+                    height: 140
+                }).toBlob(function (blob) {
+                    var timeStamp = Date.parse(new Date());
+                    var fileName = timeStamp + '.jpg';
+                    var formData = new FormData();
+                    formData.append('file', blob, fileName);
+                    formData.append('fileName', fileName);
+                    formData.append('fileToken', timeStamp);
+                    
+					$.ajax({
+                        method: "post",
+                        //用于文件上传的服务器端请求地址
+                        url: MODULE_PATH + "/user/updateAvatar",
+                        data: formData,
+                        processData: false,
+                        contentType: false,
+                        success: function (result) {
+                            if (result.code == 200) {
+                                layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                                    parent.layui.$("#Avatar").attr("src", result.data);
+                                    var reader = new FileReader();
+                                    reader.readAsDataURL(blob);
+                                    reader.onload = function (e) {
+                                        var data = {
+                                            index:parent.layer.getFrameIndex(window.name),
+                                            newAvatar : e.target.result
+                                        };
+                                        parent.window.callback(data);
+                                    };
+                                });
+                            } else {
+                                layer.msg(result.msg, {icon: 2, time: 1000});
+                            }
+                        },
+                        error: function (result) {
+                            layer.msg(result.msg, {icon: 2, time: 1000});
+                        }
+                    });
+                });
+            }
+
+            $(".pear-btn").on('click', function () {
+                var event = $(this).attr("cropper-event");
+
+                if (event === 'rotate') {
+                    var option = $(this).attr('data-option');
+                    $("#sourceImage").cropper('rotate', option);
+                } else if (event === 'reset') {
+                    $("#sourceImage").cropper('reset');
+                }
+
+                $("#uploadPicture").change(function () {
+                    var r = new FileReader();
+                    var f = this.files[0];
+
+                    var uploadFileSize = f.size / 1024;
+                    if (uploadFileSize > 5120) {
+                        parent.layer.msg("上传文件不得超过5m", { icon: 5 });
+                        return false;
+                    }
+
+                    r.readAsDataURL(f);
+                    r.onload = function (e) {
+                        $("#sourceImage")
+                            .cropper('destroy')
+                            .attr('src', this.result)
+                            .cropper(options);
+                    };
+                });
+            });
+        });
+    </script>
+</body>
+
+</html>
\ No newline at end of file
-- 
Gitee


From d340cd401c5a069b50f5062b7a4e6951260760ad Mon Sep 17 00:00:00 2001
From: zhaonengzhi <zhaonengzhi@foxmail.com>
Date: Mon, 23 Aug 2021 10:15:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86,=20=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=A0=91=20Signed-off-by:=20zhaonengzhi=20<zhaonengzhi@foxmail?=
 =?UTF-8?q?.com>=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/?=
 =?UTF-8?q?main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java?=
 =?UTF-8?q?=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/?=
 =?UTF-8?q?java/com/fc/v2/controller/AdminController.java=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/?=
 =?UTF-8?q?v2/controller/admin/SysDepartmentController.java=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/?=
 =?UTF-8?q?v2/controller/admin/SysUserController.java=20=E5=B7=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/mapper?=
 =?UTF-8?q?/auto/TSysUserMapper.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20src/main/java/com/fc/v2/model/custom/email/Ma?=
 =?UTF-8?q?ilSenderInfo.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20src/main/java/com/fc/v2/model/custom/email/MyAuthentic?=
 =?UTF-8?q?ator.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?src/main/java/com/fc/v2/service/ITSysUserService.java=20?=
 =?UTF-8?q?=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/jav?=
 =?UTF-8?q?a/com/fc/v2/service/impl/TSysUserServiceImpl.java=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/?=
 =?UTF-8?q?v2/shiro/service/MyShiroRealm.java=20=E5=B7=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=20=20=20=20=20=20src/main/java/com/fc/v2/util/A?=
 =?UTF-8?q?utoCode/AutoCodeUtil.java=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20src/main/resources/mybatis/auto/TsysUserMappe?=
 =?UTF-8?q?r.xml=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/?=
 =?UTF-8?q?main/resources/templates/admin/index.html=20=E5=B7=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=20=20=20=20=20=20src/main/resources/templates/a?=
 =?UTF-8?q?dmin/sysPermission/tree.html=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20src/main/resources/templates/admin/sysUser?=
 =?UTF-8?q?/add.html=20=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?src/main/resources/templates/admin/sysUser/edit.html=20?=
 =?UTF-8?q?=E5=B7=B2=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/res?=
 =?UTF-8?q?ources/templates/admin/sysUser/editPwd.html=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=20=20=20=20=20src/main/resources/te?=
 =?UTF-8?q?mplates/admin/sysUser/list.html=20=E5=B7=B2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20src/main/resources/templates/admin/sysU?=
 =?UTF-8?q?ser/person.html=20=E5=B7=B2=E6=B7=BB=E5=8A=A0=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20src/main/resources/templates/admin/sysDepartment/dept-tre?=
 =?UTF-8?q?e.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interceptor/MyWebAppConfigurer.java       | 144 ++++----
 .../com/fc/v2/controller/AdminController.java |  46 ++-
 .../admin/SysDepartmentController.java        |  11 +
 .../controller/admin/SysUserController.java   |  24 +-
 .../com/fc/v2/mapper/auto/TSysUserMapper.java |   8 +
 .../v2/model/custom/email/MailSenderInfo.java | 334 ++++++++++--------
 .../model/custom/email/MyAuthenticator.java   |  35 +-
 .../com/fc/v2/service/ITSysUserService.java   |   8 +
 .../v2/service/impl/TSysUserServiceImpl.java  |  11 +
 .../com/fc/v2/shiro/service/MyShiroRealm.java |  74 ++--
 .../com/fc/v2/util/AutoCode/AutoCodeUtil.java |   7 +-
 .../resources/mybatis/auto/TsysUserMapper.xml |  48 +--
 src/main/resources/templates/admin/index.html |   5 +-
 .../admin/sysDepartment/dept-tree.html        |  62 ++++
 .../templates/admin/sysPermission/tree.html   |   2 +-
 .../templates/admin/sysUser/add.html          |  91 +++--
 .../templates/admin/sysUser/edit.html         |  72 ++--
 .../templates/admin/sysUser/editPwd.html      |  70 ++--
 .../templates/admin/sysUser/list.html         | 105 ++++--
 .../templates/admin/sysUser/person.html       |  22 +-
 20 files changed, 736 insertions(+), 443 deletions(-)
 create mode 100644 src/main/resources/templates/admin/sysDepartment/dept-tree.html

diff --git a/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java b/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java
index 4a243e6..c3b5ea0 100644
--- a/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java
+++ b/src/main/java/com/fc/v2/common/interceptor/MyWebAppConfigurer.java
@@ -15,93 +15,83 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp
 
 /**
  * 拦截器
-* @ClassName: MyWebAppConfigurer
-* @author fuce
-* @date 2018年6月3日
-*
+ * 
+ * @ClassName: MyWebAppConfigurer
+ * @author fuce
+ * @date 2018年6月3日
  */
 @Configuration
-public class MyWebAppConfigurer  extends  WebMvcConfigurationSupport  {
-	
-	//private static Logger logger=LoggerFactory.getLogger(WebMvcConfigurationSupport.class);
+public class MyWebAppConfigurer extends WebMvcConfigurationSupport {
 
-	@Autowired
-	private V2Config v2Config;
+    // private static Logger logger=LoggerFactory.getLogger(WebMvcConfigurationSupport.class);
 
-	/** 解决跨域问题 **/
-	@Override
-	public void addCorsMappings(CorsRegistry registry){
-		/*
-			registry.addMapping("/**")
-			// 设置允许跨域请求的域名
-			.allowedOrigins("*")
-			// 是否允许证书
-			.allowCredentials(true)
-			// 设置允许的方法
-			.allowedMethods("GET", "POST", "DELETE", "PUT")
-			// 设置允许的header属性
-			.allowedHeaders("*")
-			// 跨域允许时间
-			.maxAge(3600);
-			super.addCorsMappings(registry);
-		*/
-	}
-	
-	/** 添加拦截器 **/
-	@Override
-	protected void addInterceptors(InterceptorRegistry registry){
-		registry.addInterceptor(new MyInterceptor());
-		super.addInterceptors(registry);
-	}
-	
-	/** 这里配置视图解析器 **/
-	@Override
-	protected void configureViewResolvers(ViewResolverRegistry registry){
-		super.configureViewResolvers(registry);
-	}
-	
-	/** 配置内容裁决的一些选项 **/
-	@Override
-	protected void configureContentNegotiation(ContentNegotiationConfigurer configurer){
-		super.configureContentNegotiation(configurer);
-	}
-	
-	/** 视图跳转控制器 **/
-	@Override
-	protected void addViewControllers(ViewControllerRegistry registry) {
-		
-		super.addViewControllers(registry);
-	}
-	
-	
-	/** 静态资源处理 **/
-	@Override
-    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
-		//配置虚拟路径为项目得static下面
-        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
-		//添加swagger
-//        registry.addResourceHandler("swagger-ui.html").addResourceLocations(
-//                "classpath:/META-INF/resources/");
-//        registry.addResourceHandler("/webjars/**").addResourceLocations(
-//                "classpath:/META-INF/resources/webjars/");
-//        
-        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-		/** 本地文件上传路径 */
-		registry.addResourceHandler(FileUploadUtils.RESOURCE_PREFIX+ "/**").addResourceLocations("file:" + v2Config.getProfile() + "/");
+    @Autowired
+    private V2Config v2Config;
+
+    /** 解决跨域问题 **/
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        /*
+         * registry.addMapping("/**") // 设置允许跨域请求的域名 .allowedOrigins("*") // 是否允许证书
+         * .allowCredentials(true) // 设置允许的方法 .allowedMethods("GET", "POST", "DELETE", "PUT") //
+         * 设置允许的header属性 .allowedHeaders("*") // 跨域允许时间 .maxAge(3600);
+         * super.addCorsMappings(registry);
+         */
+    }
+
+    /** 添加拦截器 **/
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new MyInterceptor());
+        super.addInterceptors(registry);
+    }
 
-		super.addResourceHandlers(registry);
+    /** 这里配置视图解析器 **/
+    @Override
+    protected void configureViewResolvers(ViewResolverRegistry registry) {
+        super.configureViewResolvers(registry);
+    }
 
+    /** 配置内容裁决的一些选项 **/
+    @Override
+    protected void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        super.configureContentNegotiation(configurer);
     }
-	/** 默认静态资源处理器 **/
 
-	protected void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
-		//super.configureDefaultServletHandling(configurer);
-		//configurer.enable("stati");
-		super.configureDefaultServletHandling(configurer);
-	}
+    /** 视图跳转控制器 **/
+    @Override
+    protected void addViewControllers(ViewControllerRegistry registry) {
+        super.addViewControllers(registry);
+    }
 
 
+    /** 静态资源处理 **/
+    @Override
+    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // 配置虚拟路径为项目得static下面
+        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+        // 添加swagger
+        // registry.addResourceHandler("swagger-ui.html").addResourceLocations(
+        // "classpath:/META-INF/resources/");
+        // registry.addResourceHandler("/webjars/**").addResourceLocations(
+        // "classpath:/META-INF/resources/webjars/");
+        //
+        registry.addResourceHandler("doc.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        /** 本地文件上传路径 */
+        registry.addResourceHandler(FileUploadUtils.RESOURCE_PREFIX + "/**")
+                .addResourceLocations("file:" + v2Config.getProfile() + "/");
 
+        super.addResourceHandlers(registry);
+    }
 
+    /** 默认静态资源处理器 **/
+    @Override
+    protected void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        // super.configureDefaultServletHandling(configurer);
+        // configurer.enable("stati");
+        super.configureDefaultServletHandling(configurer);
+    }
 }
diff --git a/src/main/java/com/fc/v2/controller/AdminController.java b/src/main/java/com/fc/v2/controller/AdminController.java
index 8efaff1..ddf17c3 100644
--- a/src/main/java/com/fc/v2/controller/AdminController.java
+++ b/src/main/java/com/fc/v2/controller/AdminController.java
@@ -65,7 +65,7 @@ public class AdminController extends BaseController {
     /**
      * 请求到登陆界面
      *
-     * @param request
+     * @param modelMap
      * @return
      */
     @ApiOperation(value = "请求到登陆界面", notes = "请求到登陆界面")
@@ -88,12 +88,10 @@ public class AdminController extends BaseController {
 
     /**
      * 用户登陆验证
-     *
      * @param user
-     * @param rcode
+     * @param captcha
      * @param redirectAttributes
      * @param rememberMe
-     * @param model
      * @param request
      * @return
      */
@@ -108,8 +106,8 @@ public class AdminController extends BaseController {
         String verCode = (String) request.getSession().getAttribute("captcha");
         // 判断验证码
         if (captcha != null && captcha.toLowerCase().equals(verCode.trim().toLowerCase())) {
-            //清除验证码
-            CaptchaUtil.clear(request);  // 清除session中的验证码
+            //清除session中的验证码
+            CaptchaUtil.clear(request);
             yz = true;
         }
 
@@ -167,17 +165,12 @@ public class AdminController extends BaseController {
 
     }
 
-
     /**
      * 手机登录
-     *
      * @param user
-     * @param redirectAttributes
      * @param rememberMe
      * @param request
      * @return
-     * @author fuce
-     * @Date 2020年12月7日 上午12:54:28
      */
     @ApiOperation(value = "手机登录", notes = "手机登录")
     @PostMapping("/API/login")
@@ -249,7 +242,8 @@ public class AdminController extends BaseController {
 
     /**
      * 退出登陆
-     *
+     * @param request
+     * @param response
      * @return
      */
     @ApiOperation(value = "退出登陆", notes = "退出登陆")
@@ -263,31 +257,46 @@ public class AdminController extends BaseController {
         return success();
     }
 
-    /**** 页面测试 ****/
+    /**** 页面测试BEGIN ****/
+
+    /**
+     * 404页面
+     * @param request
+     * @param response
+     * @return
+     */
     @ApiOperation(value = "404页面", notes = "404页面")
     @GetMapping("Out404")
     public String Out404(HttpServletRequest request, HttpServletResponse response) {
-
         return "redirect:/error/404";
     }
 
-    @GetMapping("Out403")
+    /**
+     * 403页面
+     * @param request
+     * @param response
+     * @return
+     */
     @ApiOperation(value = "403页面", notes = "403页面")
+    @GetMapping("Out403")
     public String Out403(HttpServletRequest request, HttpServletResponse response) {
-
         return "redirect:/error/403";
     }
 
+    /**
+     * 500页面
+     * @param request
+     * @param response
+     * @return
+     */
     @ApiOperation(value = "500页面", notes = "500页面")
     @GetMapping("Out500")
     public String Out500(HttpServletRequest request, HttpServletResponse response) {
-
         return "redirect:/error/500";
     }
 
     /**
      * 权限测试跳转页面
-     *
      * @param request
      * @param response
      * @return
@@ -296,7 +305,6 @@ public class AdminController extends BaseController {
     @GetMapping("Outqx")
     @RequiresPermissions("system:user:asd")
     public String Outqx(HttpServletRequest request, HttpServletResponse response) {
-
         return "redirect:/error/500";
     }
     /**** 页面测试EDN ****/
diff --git a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java
index 2581e27..d534a45 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java
@@ -183,6 +183,17 @@ public class SysDepartmentController extends BaseController {
         return sysDepartmentService.selectTSysDepartmentById(id);
     }
 
+    /**
+     * 跳转树形列表
+     *
+     * @return
+     */
+    @ApiOperation(value = "跳转树形列表", notes = "跳转树形列表")
+    @GetMapping("/deptTree")
+    public String deptTree() {
+        return prefix + "/dept-tree.html";
+    }
+
     /**
      * 获取部门树状数据结构
      *
diff --git a/src/main/java/com/fc/v2/controller/admin/SysUserController.java b/src/main/java/com/fc/v2/controller/admin/SysUserController.java
index eb258c3..5cc5b0d 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysUserController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysUserController.java
@@ -2,6 +2,7 @@ package com.fc.v2.controller.admin;
 
 import java.util.List;
 
+import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.conf.V2Config;
 import com.fc.v2.common.domain.ResultTable;
@@ -81,7 +82,7 @@ public class SysUserController extends BaseController {
      * @param tSysUser
      * @return
      */
-    @Log(title = "分页查询", action = "1")
+    @Log(title = "分页查询", action = "list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("system:user:list")
@@ -92,6 +93,23 @@ public class SysUserController extends BaseController {
         return pageTable(page.getList(), page.getTotal());
     }
 
+    /**
+     * 按部门查询用户列表
+     *
+     * @param deptIds
+     * @return
+     */
+    @Log(title = "分页查询", action = "list")
+    @ApiOperation(value = "分页查询", notes = "分页查询")
+    @GetMapping("/dept/list")
+    @RequiresPermissions("system:user:list")
+    @ResponseBody
+    public ResultTable list(String deptIds) {
+        startPage();
+        PageInfo<TSysUser> page = new PageInfo<TSysUser>(sysUserService.selectTSysUserByDepIdList(deptIds));
+        return pageTable(page.getList(), page.getTotal());
+    }
+
     /**
      * 新增跳转
      *
@@ -134,7 +152,7 @@ public class SysUserController extends BaseController {
     @ResponseBody
     public AjaxResult add(TSysUser user, @RequestParam(value = "roleIds", required = false) String roleIds) {
         if (sysUserService.checkLoginNameUnique(user) > 0){
-            return error("登陆用户名重复");
+            return error("用户账号重复");
         }
         return toAjax(sysUserService.insertUserRoles(user, roleIds));
     }
@@ -267,7 +285,7 @@ public class SysUserController extends BaseController {
                 tSysUser.setAvatar(avatar);
                 if (sysUserService.updateTSysUser(tSysUser) > 0){
                     ShiroUtils.setUser(sysUserService.selectTSysUserById(tSysUser.getId()));
-                    return success(200,"操作成功", avatar);
+                    return success(HttpStatus.HTTP_OK,"操作成功", avatar);
                 }
             }
             return error();
diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
index 52aa761..5d949c2 100644
--- a/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
+++ b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
@@ -28,4 +28,12 @@ public interface TSysUserMapper extends BaseMapper<TSysUser> {
 	 * @return
 	 */
 	public List<TSysUser> selectTSysUserList(TSysUser tSysUser);
+
+	/**
+	 * 查询用户列表
+	 *
+	 * @param depId
+	 * @return
+	 */
+	public List<TSysUser> selectTSysUserByDepIdList(String[] depId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/fc/v2/model/custom/email/MailSenderInfo.java b/src/main/java/com/fc/v2/model/custom/email/MailSenderInfo.java
index b275444..cc4ec56 100644
--- a/src/main/java/com/fc/v2/model/custom/email/MailSenderInfo.java
+++ b/src/main/java/com/fc/v2/model/custom/email/MailSenderInfo.java
@@ -1,164 +1,196 @@
 package com.fc.v2.model.custom.email;
 
 import java.security.GeneralSecurityException;
-/**
- * 发送邮件需要使用的基本信息 
-* @author FH QQ 313596790[青苔]
-* 修改时间：2015年7月27日
-* @version 2.0
- */
 import java.util.Properties;
-
 import com.sun.mail.util.MailSSLSocketFactory;
+
 /**
  * 邮件model
- * @ClassName: MailSenderInfo
+ * 
+ * @className: MailSenderInfo
  * @author fuce
  * @date 2019-06-10 01:06
  * @version V1.0
  */
 public class MailSenderInfo {
-	// 发送邮件的服务器的IP和端口
-	private String mailServerHost;
-	private String mailServerPort = "25";
-	// 邮件发送者的地址
-	private String fromAddress;
-	// 邮件接收者的地址
-	private String toAddress;
-	// 登陆邮件发送服务器的用户名和密码
-	private String userName;
-	private String password;
-	// 是否需要身份验证
-	private boolean validate = false;
-	//开启ssl
-	private boolean ssl=false;
-	// 邮件主题
-	private String subject;
-	// 邮件的文本内容
-	private String content;
-	// 邮件附件的文件名
-	private String[] attachFileNames;
-
-	/**
-	 * 获得邮件会话属性
-	 */
-	public Properties getProperties() {
-		Properties p = new Properties();
-		p.put("mail.smtp.host", this.mailServerHost);
-		p.put("mail.smtp.port", this.mailServerPort);
-		p.put("mail.smtp.auth", validate ? "true" : "false");
-		//-------当需使用SSL验证时添加，邮箱不需SSL验证时删除即可（测试SSL验证使用QQ企业邮箱）
-		if(ssl) {
-			String SSL_FACTORY="javax.net.ssl.SSLSocketFactory"; 
-	        p.put("mail.smtp.socketFactory.class", SSL_FACTORY);
-	        p.put("mail.smtp.socketFactory.fallback", "false");
-	        p.put("mail.smtp.socketFactory.port", this.mailServerPort);
-	        MailSSLSocketFactory sf=null;
-			try {
-				sf = new MailSSLSocketFactory();
-			} catch (GeneralSecurityException e) {
-				e.printStackTrace();
-			}
-	        sf.setTrustAllHosts(true); 
-	        p.put("mail.smtp.ssl.socketFactory", sf);
-		}
-		
-		return p;
-	}
-
-	public String getMailServerHost() {
-		return mailServerHost;
-	}
-
-	public void setMailServerHost(String mailServerHost) {
-		this.mailServerHost = mailServerHost;
-	}
-
-	public String getMailServerPort() {
-		return mailServerPort;
-	}
-
-	public void setMailServerPort(String mailServerPort) {
-		this.mailServerPort = mailServerPort;
-	}
-
-	public boolean isValidate() {
-		return validate;
-	}
-
-	public void setValidate(boolean validate) {
-		this.validate = validate;
-	}
-
-	public String[] getAttachFileNames() {
-		return attachFileNames;
-	}
-
-	public void setAttachFileNames(String[] fileNames) {
-		this.attachFileNames = fileNames;
-	}
-
-	public String getFromAddress() {
-		return fromAddress;
-	}
-
-	public void setFromAddress(String fromAddress) {
-		this.fromAddress = fromAddress;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getToAddress() {
-		return toAddress;
-	}
-
-	public void setToAddress(String toAddress) {
-		this.toAddress = toAddress;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getSubject() {
-		return subject;
-	}
-
-	public void setSubject(String subject) {
-		this.subject = subject;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String textContent) {
-		this.content = textContent;
-	}
-
-	/**
-	 * @return the ssl
-	 */
-	public boolean isSsl() {
-		return ssl;
-	}
-
-	/**
-	 * @param ssl the ssl to set
-	 */
-	public void setSsl(boolean ssl) {
-		this.ssl = ssl;
-	}
-	
-	
+    
+    /**
+     * 发送邮件的服务器的IP和端口
+     */
+    private String mailServerHost;
+    
+    /**
+     * 默认端口
+     */
+    private String mailServerPort = "25";
+    
+    /**
+     * 邮件发送者的地址
+     */
+    private String fromAddress;
+    
+    /**
+     * 邮件接收者的地址
+     */
+    private String toAddress;
+    
+    /**
+     * 登陆邮件发送服务器的用户名
+     */
+    private String userName;
+    
+    /**
+     * 登陆邮件发送服务器的密码
+     */
+    private String password;
+    
+    /**
+     * 是否需要身份验证
+     */
+    private boolean validate = false;
+    
+    /**
+     * 开启ssl
+     */
+    private boolean ssl = false;
+    
+    /**
+     * 邮件主题
+     */
+    private String subject;
+
+    /**
+     * 邮件的文本内容
+     */
+    private String content;
+
+    /**
+     *  邮件附件的文件名
+     */
+    private String[] attachFileNames;
+
+    /**
+     * 获得邮件会话属性
+     */
+    public Properties getProperties() {
+        Properties p = new Properties();
+        p.put("mail.smtp.host", this.mailServerHost);
+        p.put("mail.smtp.port", this.mailServerPort);
+        p.put("mail.smtp.auth", validate ? "true" : "false");
+        // -------当需使用SSL验证时添加，邮箱不需SSL验证时删除即可（测试SSL验证使用QQ企业邮箱）
+        if (ssl) {
+            String sslFactory = "javax.net.ssl.SSLSocketFactory";
+            p.put("mail.smtp.socketFactory.class", sslFactory);
+            p.put("mail.smtp.socketFactory.fallback", "false");
+            p.put("mail.smtp.socketFactory.port", this.mailServerPort);
+            MailSSLSocketFactory sf = null;
+            try {
+                sf = new MailSSLSocketFactory();
+            } catch (GeneralSecurityException e) {
+                e.printStackTrace();
+            }
+            sf.setTrustAllHosts(true);
+            p.put("mail.smtp.ssl.socketFactory", sf);
+        }
+
+        return p;
+    }
+
+    public String getMailServerHost() {
+        return mailServerHost;
+    }
+
+    public void setMailServerHost(String mailServerHost) {
+        this.mailServerHost = mailServerHost;
+    }
+
+    public String getMailServerPort() {
+        return mailServerPort;
+    }
+
+    public void setMailServerPort(String mailServerPort) {
+        this.mailServerPort = mailServerPort;
+    }
+
+    public boolean isValidate() {
+        return validate;
+    }
+
+    public void setValidate(boolean validate) {
+        this.validate = validate;
+    }
+
+    public String[] getAttachFileNames() {
+        return attachFileNames;
+    }
+
+    public void setAttachFileNames(String[] fileNames) {
+        this.attachFileNames = fileNames;
+    }
+
+    public String getFromAddress() {
+        return fromAddress;
+    }
+
+    public void setFromAddress(String fromAddress) {
+        this.fromAddress = fromAddress;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getToAddress() {
+        return toAddress;
+    }
+
+    public void setToAddress(String toAddress) {
+        this.toAddress = toAddress;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * 
+     * @param textContent
+     */
+    public void setContent(String textContent) {
+        this.content = textContent;
+    }
+
+    /**
+     * @return the ssl
+     */
+    public boolean isSsl() {
+        return ssl;
+    }
+
+    /**
+     * @param ssl the ssl to set
+     */
+    public void setSsl(boolean ssl) {
+        this.ssl = ssl;
+    }
 }
diff --git a/src/main/java/com/fc/v2/model/custom/email/MyAuthenticator.java b/src/main/java/com/fc/v2/model/custom/email/MyAuthenticator.java
index 0fdfd7a..14c4653 100644
--- a/src/main/java/com/fc/v2/model/custom/email/MyAuthenticator.java
+++ b/src/main/java/com/fc/v2/model/custom/email/MyAuthenticator.java
@@ -4,23 +4,28 @@ import javax.mail.Authenticator;
 import javax.mail.PasswordAuthentication;
 
 /**
- * 发送邮件需要使用的基本信息 
+ * 发送邮件需要使用的基本信息
+ * 
  * @ClassName: MyAuthenticator
  * @author fuce
  * @date 2019-06-10 01:06
  * @version V1.0
  */
-public class MyAuthenticator extends Authenticator{   
-    String userName=null;   
-    String password=null;   
-        
-    public MyAuthenticator(){   
-    }   
-    public MyAuthenticator(String username, String password) {    
-        this.userName = username;    
-        this.password = password;    
-    }    
-    protected PasswordAuthentication getPasswordAuthentication(){   
-        return new PasswordAuthentication(userName, password);   
-    }   
-}   
+public class MyAuthenticator extends Authenticator {
+    
+    String userName = null;
+    
+    String password = null;
+
+    public MyAuthenticator() {}
+
+    public MyAuthenticator(String username, String password) {
+        this.userName = username;
+        this.password = password;
+    }
+
+    @Override
+    protected PasswordAuthentication getPasswordAuthentication() {
+        return new PasswordAuthentication(userName, password);
+    }
+}
diff --git a/src/main/java/com/fc/v2/service/ITSysUserService.java b/src/main/java/com/fc/v2/service/ITSysUserService.java
index 396fe70..60f0d54 100644
--- a/src/main/java/com/fc/v2/service/ITSysUserService.java
+++ b/src/main/java/com/fc/v2/service/ITSysUserService.java
@@ -114,4 +114,12 @@ public interface ITSysUserService extends IService<TSysUser> {
 	 * @return
 	 */
 	int updateUserPassword(TSysUser tsysUser);
+
+	/**
+	 * 查询用户列表
+	 *
+	 * @param depIds
+	 * @return
+	 */
+	public List<TSysUser> selectTSysUserByDepIdList(String depIds);
 }
diff --git a/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
index 1390bb8..051a1ca 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
@@ -229,4 +229,15 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
         tsysUser.setPassword(MD5Util.encode(tsysUser.getPassword()));
         return this.updateTSysUser(tsysUser);
     }
+
+    /**
+     * 查询用户列表
+     *
+     * @param depIds
+     * @return
+     */
+    @Override
+    public List<TSysUser> selectTSysUserByDepIdList(String depIds) {
+        return tSysUserMapper.selectTSysUserByDepIdList(ConvertUtil.toStrArray(depIds));
+    }
 }
diff --git a/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java b/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java
index 8853263..8262a79 100644
--- a/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java
+++ b/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java
@@ -7,6 +7,7 @@ import com.fc.v2.service.ITSysPermissionService;
 import com.fc.v2.service.ITSysRoleService;
 import com.fc.v2.service.ITSysUserService;
 import com.fc.v2.util.StringUtils;
+import cn.hutool.core.collection.CollUtil;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
@@ -20,43 +21,52 @@ import org.apache.shiro.subject.PrincipalCollection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 身份校验核心类
  *
  * @author fuce
- * @ClassName: MyShiroRealm
+ * @className: MyShiroRealm
  * @date 2018年8月25日
  */
 @Service
 public class MyShiroRealm extends AuthorizingRealm {
 
+    /**
+     * 用户
+     */
     @Autowired
     private ITSysUserService userService;
 
-    //权限dao
+    /**
+     * 权限
+     */
     @Autowired
     private ITSysPermissionService permissionService;
 
-    //角色dao
+    /**
+     * 角色
+     */
     @Autowired
     private ITSysRoleService roleService;
 
 
     /**
      * 认证登陆
+     * @param token
+     * @return authenticationInfo
+     * @throws
      */
     @SuppressWarnings("unused")
     @Override
-    protected AuthenticationInfo doGetAuthenticationInfo(
-            AuthenticationToken token) throws AuthenticationException {
+    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
 
-        //加这一步的目的是在Post请求的时候会先进认证，然后在到请求
-        if (token.getPrincipal() == null) {
+        //加这一步的目的是在Post请求的时候会先进认证，然后在到请求        
+        if (StringUtils.isNull(token.getPrincipal())) {
             return null;
         }
+
         String username = (String) token.getPrincipal();
         String password = new String((char[]) token.getCredentials());
         // 通过username从数据库中查找 User对象，如果找到，没找到.
@@ -64,51 +74,42 @@ public class MyShiroRealm extends AuthorizingRealm {
         TSysUser userInfo = new TSysUser();
         userInfo.setUsername(username);
         List<TSysUser> list = userService.selectTSysUserList(userInfo);
-//		System.out.println(userInfo);
-//		System.out.println("----->>userInfo=" + userInfo.getUsername() + "---"+ userInfo.getPassword());
-        if (list == null || list.size() == 0) {
+
+        if (CollUtil.isEmpty(list)) {
             return null;
-        } else {
-            userInfo = list.get(0);
-            SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo(
-                    // 用户对象
-                    userInfo,
-                    // 密码
-                    userInfo.getPassword(),
-                    // realm name
-                    getName()
-            );
-            return authenticationInfo;
         }
 
+        userInfo = list.get(0);
+        return new SimpleAuthenticationInfo(userInfo, userInfo.getPassword(), getName());
     }
 
     /**
      * 授权查询回调函数, 进行鉴权但缓存中无用户的授权信息时调用.
+     * @param principals
+     * @return
      */
     @Override
     protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
-        //System.out.println("权限配置-->MyShiroRealm.doGetAuthorizationInfo()");
-        if (principals == null) {
+
+        if (StringUtils.isNull(principals)) {
             throw new AuthorizationException("principals should not be null");
         }
+
         SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo();
         TSysUser userinfo = (TSysUser) principals.getPrimaryPrincipal();
         Long uid = userinfo.getId();
         List<TSysRole> tsysRoles = roleService.queryUserRole(uid);
-        for (TSysRole userrole : tsysRoles) {
-            //System.out.println("角色名字:"+gson.toJson(userrole));
-            Long rolid = userrole.getId();//角色id
-            authorizationInfo.addRole(userrole.getName());//添加角色名字
-            List<TSysPermission> permissions = permissionService.queryRoleId(rolid);
-            for (TSysPermission p : permissions) {
-                //System.out.println("角色下面的权限:"+gson.toJson(p));
-                if (StringUtils.isNotEmpty(p.getPerms())) {
-                    authorizationInfo.addStringPermission(p.getPerms());
+        tsysRoles.forEach(userrole -> {
+            //添加角色名字
+            authorizationInfo.addRole(userrole.getName());
+            List<TSysPermission> permissions = permissionService.queryRoleId(userrole.getId());
+            permissions.forEach(permission ->{
+                //角色下面的权限
+                if (StringUtils.isNotEmpty(permission.getPerms())){
+                    authorizationInfo.addStringPermission(permission.getPerms());
                 }
-
-            }
-        }
+            });
+        });
 
         return authorizationInfo;
     }
@@ -119,5 +120,4 @@ public class MyShiroRealm extends AuthorizingRealm {
     public void clearCachedAuthorizationInfo() {
         this.clearCachedAuthorizationInfo(SecurityUtils.getSubject().getPrincipals());
     }
-
 }
diff --git a/src/main/java/com/fc/v2/util/AutoCode/AutoCodeUtil.java b/src/main/java/com/fc/v2/util/AutoCode/AutoCodeUtil.java
index bcff202..c6b4e36 100644
--- a/src/main/java/com/fc/v2/util/AutoCode/AutoCodeUtil.java
+++ b/src/main/java/com/fc/v2/util/AutoCode/AutoCodeUtil.java
@@ -113,10 +113,13 @@ public class AutoCodeUtil {
                 String filepath = getCoverFileName(template, tableInfo, autoCodeConfig.getConfigkey("parentPack"), targetPath);
                 Template tpl = Velocity.getTemplate(template, "UTF-8");
                 File file = new File(filepath);
-                if (!file.getParentFile().exists())
+                if (!file.getParentFile().exists()) {
                     file.getParentFile().mkdirs();
-                if (!file.exists())
+                }
+                
+                if (!file.exists()) {
                     file.createNewFile();
+                }
                 try (FileOutputStream outStream = new FileOutputStream(file);
                      OutputStreamWriter writer = new OutputStreamWriter(outStream, "UTF-8");
                      BufferedWriter sw = new BufferedWriter(writer)) {
diff --git a/src/main/resources/mybatis/auto/TsysUserMapper.xml b/src/main/resources/mybatis/auto/TsysUserMapper.xml
index df95de8..8c1b071 100644
--- a/src/main/resources/mybatis/auto/TsysUserMapper.xml
+++ b/src/main/resources/mybatis/auto/TsysUserMapper.xml
@@ -26,35 +26,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSysUserVo">
-        select id, username, password, nickname, user_type, email, avatar, phonenumber, sex, dep_id, pos_id, create_by, create_time, update_by, update_time, remark
+        select user.id, user.username, user.password, user.nickname, user.user_type, user.email, user.avatar, user.phonenumber, 
+            user.sex, user.dep_id, user.pos_id, user.create_by, user.create_time, user.update_by, user.update_time, user.remark,
+            dept.dept_name "dep_name", post.post_name "pos_name" from t_sys_user user, t_sys_department dept, t_sys_position post
     </sql>
 
     <select id="selectTSysUserById" resultMap="TSysUserResult" parameterType="Long">
         <include refid="selectTSysUserVo"/>
-        ,
-        (select dept_name from t_sys_department dep where dep.id = tsu.dep_id) as dep_name,
-        (select post_name from t_sys_position pos where pos.id = tsu.pos_id) as pos_name
-        from t_sys_user tsu
-        where tsu.id = #{id}
+        <where>
+        	user.dep_id = dept.id and user.pos_id = post.id and user.id = #{id}
+        </where>
     </select>
 
     <select id="selectTSysUserList" resultMap="TSysUserResult" parameterType="com.fc.v2.model.auto.TSysUser">
         <include refid="selectTSysUserVo"/>
-        ,
-        (select dept_name from t_sys_department dep where dep.id = tsu.dep_id) as dep_name,
-        (select post_name from t_sys_position pos where pos.id = tsu.pos_id) as pos_name
-        from t_sys_user tsu
         <where>
-            <if test="username != null  and username != ''"> and tsu.username = #{username}</if>
-            <if test="nickname != null  and nickname != ''"> and tsu.nickname like concat('%', #{nickname}, '%')</if>
-            <if test="userType != null  and userType != ''"> and tsu.user_type = #{userType}</if>
-            <if test="email != null  and email != ''"> and tsu.email = #{email}</if>
-            <if test="phonenumber != null  and phonenumber != ''"> and tsu.phonenumber = #{phonenumber}</if>
-            <if test="sex != null  and sex != ''"> and tsu.sex = #{sex}</if>
-            <if test="avatar != null  and avatar != ''"> and tsu.avatar = #{avatar}</if>
-            <if test="depId != null "> and tsu.dep_id = #{depId}</if>
-            <if test="posId != null "> and tsu.pos_id = #{posId}</if>
+        	user.dep_id = dept.id and user.pos_id = post.id
+            <if test="username != null  and username != ''"> and user.username = #{username}</if>
+            <if test="nickname != null  and nickname != ''"> and user.nickname like concat('%', #{nickname}, '%')</if>
+            <if test="userType != null  and userType != ''"> and user.user_type = #{userType}</if>
+            <if test="email != null  and email != ''"> and user.email = #{email}</if>
+            <if test="phonenumber != null  and phonenumber != ''"> and user.phonenumber = #{phonenumber}</if>
+            <if test="sex != null  and sex != ''"> and user.sex = #{sex}</if>
+            <if test="avatar != null  and avatar != ''"> and user.avatar = #{avatar}</if>
+            <if test="depId != null "> and user.dep_id = #{depId}</if>
+            <if test="posId != null "> and user.pos_id = #{posId}</if>
         </where>
-        order by id+0 DESC
+        order by user.id+0 DESC
+    </select>
+    
+	<select id="selectTSysUserByDepIdList" resultMap="TSysUserResult" parameterType="String">
+        <include refid="selectTSysUserVo"/>
+        <where>
+			user.dep_id = dept.id and user.pos_id = post.id and user.dep_id in
+			<foreach collection="array" item="depId" open="(" separator="," close=")">
+            	#{depId}
+        	</foreach>
+        </where> 
+        order by user.id+0 DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/index.html b/src/main/resources/templates/admin/index.html
index 23509e0..f55fda6 100644
--- a/src/main/resources/templates/admin/index.html
+++ b/src/main/resources/templates/admin/index.html
@@ -73,11 +73,12 @@
 <th:block th:include="include :: footer"/>
 <script th:src="@{/static/admin/js/headImg.js}"></script>
 <script th:inline="javascript">
-    layui.use(['admin','jquery','layer','popup'], function () {
+    layui.use(['admin','jquery','layer','popup','element', 'tab'], function () {
         let admin = layui.admin;
         let $ = layui.jquery;
         let layer = layui.layer;
         let popup = layui.popup;
+        let tab = layui.tab;
 
         admin.render();
 
@@ -95,7 +96,7 @@
                 id: $(this).attr("menu-id"),
                 title: "基本资料",
                 url: $(this).attr("menu-url"),
-                close: "允许关闭"
+                close: true
             });
         });
 
diff --git a/src/main/resources/templates/admin/sysDepartment/dept-tree.html b/src/main/resources/templates/admin/sysDepartment/dept-tree.html
new file mode 100644
index 0000000..b72c4d5
--- /dev/null
+++ b/src/main/resources/templates/admin/sysDepartment/dept-tree.html
@@ -0,0 +1,62 @@
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('部门列表')"/>
+</head>
+<body>
+<form class="layui-form" action="">
+    <div class="mainBox">
+        <div class="main-container">
+            <div class="main-container">
+                <div class="layui-row layui-col-space15">
+                    <div class="layui-col-md2">
+                        <div class="layui-card">
+                            <div class="layui-card-body">
+                                <div id="organizationTreeContent" style="overflow: auto">
+                                    <ul id="organizationTree" class="dtree" data-id="0"></ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>      
+        </div>
+    </div>
+</form>
+<th:block th:include="include :: footer"/>
+<script>
+layui.use(['form','jquery','dtree'],function(){
+
+    let form = layui.form;
+    let $ = layui.jquery;
+    let dtree = layui.dtree;
+    
+    var DTree = dtree.render({
+		elem: "#organizationTree",
+		//data: data,
+		initLevel: "5", //默认展开层级为1
+		line: true, // 有线树
+		ficon: ["1", "-1"], // 设定一级图标样式。0表示方形加减图标，8表示小圆点图标
+		icon: ["0", "2"], // 设定二级图标样式。0表示文件夹图标，5表示叶子图标
+		method: 'get',
+        dataStyle: "layuiStyle",  //使用layui风格的数据格式
+        dataFormat: "list",  //配置data的风格为list
+        response:{message:"msg",statusCode:0, treeId: "id", parentId: "parentId", title: "deptName"},  //修改response中返回数据的定义
+		url: rootPath + "/SysDepartmentController/list",
+        menubar:true,
+        height: "full-150", // 设置高度，也可以直接固定数字
+        width: "80%"
+	});
+    
+    // 绑定节点点击事件
+    dtree.on("node(organizationTree)", function(obj) {
+        parent.layui.$("#depId").val(obj.param.nodeId);
+        parent.layui.$("#depName").val(obj.param.context);
+        //当你在iframe页面关闭自身时 先得到当前iframe层的索引
+        var index = parent.layer.getFrameIndex(window.name); 
+        //再执行关闭 
+        parent.layer.close(index); 
+    });
+})
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/sysPermission/tree.html b/src/main/resources/templates/admin/sysPermission/tree.html
index 84aba8d..74af9f8 100644
--- a/src/main/resources/templates/admin/sysPermission/tree.html
+++ b/src/main/resources/templates/admin/sysPermission/tree.html
@@ -40,7 +40,7 @@
             checkbar: true,
             skin: "layui",
             initLevel: "1",
-            checkbarType: "self",
+            checkbarType: "all", // 默认就是all，其他的值为： no-all  p-casc   self  only
             response: {treeId: "powerId", parentId: "parentId", title: "powerName"},
         });
 
diff --git a/src/main/resources/templates/admin/sysUser/add.html b/src/main/resources/templates/admin/sysUser/add.html
index a03786a..f1ef92c 100644
--- a/src/main/resources/templates/admin/sysUser/add.html
+++ b/src/main/resources/templates/admin/sysUser/add.html
@@ -8,45 +8,78 @@
     <div class="mainBox">
         <div class="main-container">
             <div class="main-container">
+                <input id="depId" name="depId"  type="hidden"/>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">用户账号<span style="color: red;">*</span></label>
+                    <div class="layui-input-block">
+                        <input type="text" name="username" autocomplete="off" placeholder="请输入用户账号" class="layui-input" lay-verify="required|username" required>
+                    </div>
+                </div>
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">登录名称</label>
+                    <label class="layui-form-label">用户密码<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input type="text" name="username" lay-verify="username" autocomplete="off" placeholder="登录名称" class="layui-input">
+                        <input type="password" name="newpassword" autocomplete="off" placeholder="请输入密码" class="layui-input" lay-verify="required|password" required>
                     </div>
+                </div>
 
+                <div class="layui-form-item">
+                    <label class="layui-form-label">确认密码<span style="color: red;">*</span></label>
+                    <div class="layui-input-block">
+                        <input type="password" name="password" autocomplete="off" placeholder="请再次确认密码" class="layui-input" lay-verify="required|password" required>
+                    </div>
                 </div>
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">用户密码</label>
+                    <label class="layui-form-label">昵称<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input type="password" name="password" lay-verify="password" autocomplete="off" placeholder="请输入密码" class="layui-input">
+                        <input type="text" name="nickname" autocomplete="off" placeholder="请输入昵称" class="layui-input" lay-verify="required|nickname" required>
                     </div>
                 </div>
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">昵称</label>
+                    <label class="layui-form-label">性别:<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input type="text" name="nickname" lay-verify="nickname" autocomplete="off" placeholder="请输入昵称" class="layui-input">
+                        <input type="radio" name="sex" value="0" title="男" lay-filter="1" checked>
+                        <input type="radio" name="sex" value="1" title="女" lay-filter="2" >
                     </div>
                 </div>
 
                 <div class="layui-form-item">
-                    <label class="layui-form-label">部门</label>
+                    <label class="layui-form-label">手机号码<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <ul id="selectParent" name="deptId" class="dtree" data-id="0"></ul>
+                        <input type="text" name="phonenumber"  autocomplete="off" placeholder="请输入手机号码" class="layui-input" lay-verify="required|phone" required>
                     </div>
                 </div>
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">岗位</label>
+                    <label class="layui-form-label">用户邮箱<span style="color: red;">*</span></label>
+                    <div class="layui-input-block">
+                        <input type="text" name="email"  autocomplete="off" placeholder="请输入用户邮箱" class="layui-input" lay-verify="required|email" required>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">部门<span style="color: red;">*</span></label>
+                    <div class="layui-input-block">
+                        <input id="depName" type="text" name="depName"  autocomplete="off" placeholder="请输入部门" class="layui-input" lay-verify="required" required>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">岗位<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
                         <select id="positionId" name="posId">
                             <option th:each="list : ${sysPositionsList}" th:text="${list.postName}" th:value="${list.id}"></option>
                         </select>
                     </div>
                 </div>
+
                 <div class="layui-form-item">
                     <label class="layui-form-label">角色</label>
                     <div class="layui-input-block">
-                        <input th:each="sysRole:${tsysRoleList}" th:value="${sysRole.id}" th:title="${sysRole.name}"
-                               type="checkbox"  lay-skin="primary">
+                        <input th:each="sysRole:${tsysRoleList}" th:value="${sysRole.id}" th:title="${sysRole.name}" type="checkbox"  lay-skin="primary">
                     </div>
                 </div>
 
@@ -74,30 +107,38 @@
         let dtree = layui.dtree;
         let MODULE_PATH = rootPath+"/UserController";
         let DEPAR_PATH=rootPath+"/SysDepartmentController";
-        //部门树
-        dtree.renderSelect({
-            elem: "#selectParent",
-            url: DEPAR_PATH+"/tree",
-            method: 'get',
-            selectInputName: {nodeId: "depId"},
-            skin: "layui",
-            dataFormat: "list",
-            response: {treeId: "id", parentId: "parentId", title: "deptName"},
-            selectInitVal: "1"
-        });
+
+        form.render();
 
         //名称验证
         form.verify({
             username: function(value){
-                if(value.length < 2){
-                    return '标题至少得2个字符啊';
+                if(value.length < 4){
+                    return '用户账号必须大于4个字符';
+                }
+            },
+            password: function(value){
+                let pwd = $("input[name='newpassword']").val();
+                let confirm = $("input[name='password']").val();
+                if(pwd !== confirm){
+                    return '两次密码输入不一致';
                 }
             }
         });
 
+        //点击部门
+        $("#depName").focus(function () {
+            layer.open({
+                type: 2,
+                title: '部门列表',
+                shade: 0.1,
+                area: ['320px', '600px'],
+                content: DEPAR_PATH + '/deptTree'
+            });
+        });
+
         //保存
         form.on('submit(user-save)', function (data) {
-
             let roleIds = "";
             $('input[type=checkbox]:checked').each(function () {
                 roleIds += $(this).val() + ",";
diff --git a/src/main/resources/templates/admin/sysUser/edit.html b/src/main/resources/templates/admin/sysUser/edit.html
index e2fad2b..c9f0fff 100644
--- a/src/main/resources/templates/admin/sysUser/edit.html
+++ b/src/main/resources/templates/admin/sysUser/edit.html
@@ -8,31 +8,50 @@
     <div class="mainBox">
         <div class="main-container">
             <div class="main-container">
-                <div class="layui-form-item layui-hide">
-                    <label class="layui-form-label">编号</label>
+                <input name="id"  type="hidden"  th:field="*{id}" />
+                <input id="depId" name="depId"  type="hidden" th:field="*{depId}" />
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">用户账号<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input type="text" th:value="*{id}" name="id" lay-verify="title"
-                               autocomplete="off" placeholder="请输入标题" class="layui-input">
+                        <input th:value="*{username}" type="text" name="username" autocomplete="off" placeholder="请输入用户账号" class="layui-input" lay-verify="required" required>
                     </div>
                 </div>
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">登录名称</label>
+                    <label class="layui-form-label">昵称<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input th:value="*{username}" type="text" name="username" lay-verify="username" autocomplete="off" placeholder="登录名称" class="layui-input">
+                        <input th:value="*{nickname}" type="text" name="nickname" autocomplete="off" placeholder="请输入昵称" class="layui-input" lay-verify="required" required>
                     </div>
+                </div>
 
+                <div class="layui-form-item">
+                    <label class="layui-form-label">性别:<span style="color: red;">*</span></label>
+                    <div class="layui-input-block">
+                        <input type="radio" name="sex" value="0" title="男" lay-filter="1" checked>
+                        <input type="radio" name="sex" value="1" title="女" lay-filter="2" >
+                    </div>
                 </div>
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">昵称</label>
+                    <label class="layui-form-label">手机号码<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input th:value="*{nickname}" type="text" name="nickname" lay-verify="nickname" autocomplete="off" placeholder="请输入昵称" class="layui-input">
+                        <input th:value="*{phonenumber}" type="text" name="phonenumber"  autocomplete="off" placeholder="请输入手机号码" class="layui-input" lay-verify="required" required>
                     </div>
                 </div>
 
                 <div class="layui-form-item">
-                    <label class="layui-form-label">部门</label>
+                    <label class="layui-form-label">用户邮箱<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <ul id="selectParent" name="deptId" class="dtree" data-id="0"></ul>
+                        <input th:value="*{email}" type="text" name="email"  autocomplete="off" placeholder="请输入用户邮箱" class="layui-input" lay-verify="required|email" required>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">部门<span style="color: red;">*</span></label>
+                    <div class="layui-input-block">
+<!--                        <ul id="selectParent" name="deptId" class="dtree" data-id="0"></ul>-->
+                        <input id="depName" th:value="*{depName}" type="text" name="depName"  autocomplete="off" placeholder="请输入部门" class="layui-input" lay-verify="required" required>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -46,10 +65,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">角色</label>
                     <div class="layui-input-block">
-                        <input th:each="sysRole:${roleVos}" th:value="${sysRole.id}" th:title="${sysRole.name}" th:checked="${sysRole.ischeck}"
-                               type="checkbox"  lay-skin="primary">
-
-
+                        <input th:each="sysRole:${roleVos}" th:value="${sysRole.id}" th:title="${sysRole.name}" th:checked="${sysRole.ischeck}" type="checkbox"  lay-skin="primary">
                     </div>
                 </div>
 
@@ -58,8 +74,7 @@
     </div>
     <div class="bottom">
         <div class="button-container">
-            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit=""
-                    lay-filter="user-update">
+            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit="" lay-filter="user-update">
                 <i class="layui-icon layui-icon-ok"></i>
                 提交
             </button>
@@ -77,20 +92,10 @@
         let $ = layui.jquery;
         let dtree = layui.dtree;
         let MODULE_PATH = rootPath+"/UserController";
-        let DEPAR_PATH=rootPath+"/SysDepartmentController";
+        let DEPAR_PATH = rootPath+"/SysDepartmentController";
         let username='[[${TsysUser.username}]]';
-          //部门树
-        dtree.renderSelect({
-            elem: "#selectParent",
-            url: DEPAR_PATH+"/tree",
-            method: 'get',
-            selectInputName: {nodeId: "depId"},
-            skin: "layui",
-            dataFormat: "list",
-            response: {treeId: "id", parentId: "parentId", title: "deptName"},
-            selectInitVal: "[[${TsysUser.depId}]]"
-        });
 
+        form.render();
 
         //名称验证
         form.verify({
@@ -119,6 +124,17 @@
             }
         });
 
+        //部门
+        $("#depName").focus(function () {
+            layer.open({
+                type: 2,
+                title: '部门列表',
+                shade: 0.1,
+                area: ['320px', '550px'],
+                content: DEPAR_PATH + '/deptTree'
+            });
+        });
+
         form.on('submit(user-update)', function (data) {
             let roleIds = "";
             $('input[type=checkbox]:checked').each(function () {
diff --git a/src/main/resources/templates/admin/sysUser/editPwd.html b/src/main/resources/templates/admin/sysUser/editPwd.html
index 48e1e2e..1f99020 100644
--- a/src/main/resources/templates/admin/sysUser/editPwd.html
+++ b/src/main/resources/templates/admin/sysUser/editPwd.html
@@ -8,35 +8,28 @@
     <div class="mainBox">
         <div class="main-container">
             <div class="main-container">
-                <div class="layui-form-item layui-hide">
-                    <label class="layui-form-label">编号</label>
-                    <div class="layui-input-block">
-                        <input type="text" th:value="*{id}" name="id" lay-verify="title"
-                               autocomplete="off" placeholder="请输入标题" class="layui-input">
-                    </div>
-                </div>
+                <input name="id" type="hidden" th:field="*{id}" />
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">登录密码</label>
+                    <label class="layui-form-label">新密码:<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input type="password" name="password" lay-verify="password" autocomplete="off" placeholder="请输入昵称" class="layui-input">
+                        <input type="password" name="newPassword" autocomplete="off" placeholder="请输入新密码" class="layui-input" lay-verify="required|password" required>
                     </div>
                 </div>
 
                 <div class="layui-form-item">
-                    <label class="layui-form-label">确认密码</label>
+                    <label class="layui-form-label">确认密码:<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input type="password" name="confirm" lay-verify="confirm" autocomplete="off" placeholder="请输入确认密码" class="layui-input">
+                        <input type="password" name="password" autocomplete="off" placeholder="请再次确认密码" class="layui-input" lay-verify="required|confirm" required>
                     </div>
                 </div>
 
-
             </div>
         </div>
     </div>
     <div class="bottom">
         <div class="button-container">
-            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit=""
-                    lay-filter="user-update">
+            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit="" lay-filter="user-update">
                 <i class="layui-icon layui-icon-ok"></i>
                 提交
             </button>
@@ -53,36 +46,45 @@
         let form = layui.form;
         let $ = layui.jquery;
         let MODULE_PATH = rootPath+"/UserController";
+
+        form.render();
+
         //名称验证
         form.verify({
             confirm: function(value){
-                let pwd=$("input[name='password']").val();
-                let confirm=$("input[name='confirm']").val();
-                if(pwd!=confirm){
+                let pwd = $("input[name='newPassword']").val();
+                let confirm = $("input[name='password']").val();
+                if(pwd !== confirm){
                     return '两次密码输入不一致';
                 }
-
             }
         });
 
         form.on('submit(user-update)', function (data) {
-            $.ajax({
-                url: MODULE_PATH+'/editPwd',
-                data: data.field,
-                dataType: 'json',
-                contentType: 'application/x-www-form-urlencoded',
-                type: 'post',
-                success: function (result) {
-                    if (result.code==200) {
-                        layer.msg(result.msg, {icon: 1, time: 1000}, function () {
-                            parent.layer.close(parent.layer.getFrameIndex(window.name));//关闭当前页
-                            parent.layui.table.reload("user-table");
-                        });
-                    } else {
-                        layer.msg(result.msg, {icon: 2, time: 1000});
+            layer.confirm('确定重置密码?', {
+                btn: ['确定','取消']
+            }, function(){
+                $.ajax({
+                    url: MODULE_PATH+'/editPwd',
+                    data: data.field,
+                    dataType: 'json',
+                    contentType: 'application/x-www-form-urlencoded',
+                    type: 'post',
+                    success: function (result) {
+                        if (result.code==200) {
+                            layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                                parent.layer.close(parent.layer.getFrameIndex(window.name));//关闭当前页
+                                parent.layui.table.reload("user-table");
+                            });
+                        } else {
+                            layer.msg(result.msg, {icon: 2, time: 1000});
+                        }
                     }
-                }
-            })
+                });
+            }, function(){
+                parent.layer.close(parent.layer.getFrameIndex(window.name));//关闭当前页
+                parent.layui.table.reload("user-table");
+            });
             return false;
         });
     })
diff --git a/src/main/resources/templates/admin/sysUser/list.html b/src/main/resources/templates/admin/sysUser/list.html
index f1e0c2a..3c9713c 100644
--- a/src/main/resources/templates/admin/sysUser/list.html
+++ b/src/main/resources/templates/admin/sysUser/list.html
@@ -8,10 +8,16 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">登录名称</label>
+                <label class="layui-form-label">用户账号</label>
                 <div class="layui-input-inline">
                     <input type="text" name="username" placeholder="" class="layui-input">
                 </div>
+
+                <label class="layui-form-label">手机号码</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="phonenumber" placeholder="" class="layui-input">
+                </div>
+
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="role-query">
                     <i class="layui-icon layui-icon-search"></i>
                     查询
@@ -24,9 +30,22 @@
         </form>
     </div>
 </div>
-<div class="layui-card">
-    <div class="layui-card-body">
-        <table id="user-table" lay-filter="user-table"></table>
+<div class="layui-row layui-col-space15">
+    <div class="layui-col-md2">
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <div id="organizationTreeContent" style="overflow: auto">
+                    <ul id="organizationTree" class="dtree organizationTree" data-id="0"></ul>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-col-md10">
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <table id="user-table" lay-filter="user-table"></table>
+            </div>
+        </div>
     </div>
 </div>
 </body>
@@ -43,43 +62,68 @@
 </script>
 
 <script type="text/html" id="user-bar">
-
-    <button shiro:hasPermission="system:user:edit" class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>
-    </button>
-
-    <button shiro:hasPermission="system:user:remove" class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove"><i class="layui-icon layui-icon-delete"></i>
-    </button>
-
-
-    <button shiro:hasPermission="system:user:editPwd" class="pear-btn pear-btn-warming pear-btn-md" lay-event="editPwd"><i class="layui-icon layui-icon-password"></i>
-    </button>
-
-
+    {{#  if(!(d.id == 1)){ }}
+        <button shiro:hasPermission="system:user:edit" class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>
+        </button>
+        <button shiro:hasPermission="system:user:remove" class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove"><i class="layui-icon layui-icon-delete"></i>
+        </button>
+        <button shiro:hasPermission="system:user:editPwd" class="pear-btn pear-btn-warming pear-btn-md" lay-event="editPwd"><i class="layui-icon layui-icon-password"></i>
+        </button>
+    {{#  } }}
 </script>
 
 <script type="text/html" id="role-enable">
     <input type="checkbox" name="enable" value="{{d.roleId}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="role-enable" {{d.enable== '0' ? 'checked' : '' }} >
 </script>
+<script type="text/html" id="user-sex">
+    {{#if (d.sex == 0) { }}
+    <span>男</span>
+    {{# }else if(d.sex == 1){ }}
+    <span>女</span>
+    {{# } }}
+</script>
 
 <th:block th:include="include :: footer"/>
 <script>
-    layui.use(['table', 'form', 'jquery'], function () {
+    layui.use(['table', 'form', 'jquery', 'dtree'], function () {
         let table = layui.table;
         let form = layui.form;
         let $ = layui.jquery;
+        let dtree = layui.dtree;
 
         let MODULE_PATH = rootPath+"/UserController";
+
         let cols = [
             [
                 {type: 'checkbox'},
                 {title: 'ID', field: 'id', align: 'center', hide: true},
+                {title: '用户账号', field: 'username', align: 'center'},
                 {title: '昵称', field: 'nickname', align: 'center'},
-                {title: '登录名称', field: 'username', align: 'center'},
+                {title: '性别', field: 'sex', align: 'center',width: 80, templet: '#user-sex'},
+                {title: '电话', field: 'phonenumber', align: 'center'},
+                {title: '用户邮箱', field: 'email', align: 'center'},
                 {title: '部门名称', field: 'depName', align: 'center'},
                 {title: '岗位名称', field: 'posName', align: 'center'},
+                {title: '创建时间', field: 'createTime', align: 'center'},
                 {title: '操作', toolbar: '#user-bar', align: 'center'}
             ]
         ]
+        //tree表格
+        dtree.render({
+            elem: "#organizationTree",
+            initLevel: "5", //默认展开层级为1
+            line: true, // 有线树
+            ficon: ["1", "-1"], // 设定一级图标样式。0表示方形加减图标，8表示小圆点图标
+            icon: ["0", "2"], // 设定二级图标样式。0表示文件夹图标，5表示叶子图标
+            method: 'get',
+            dataStyle: "layuiStyle",  //使用layui风格的数据格式
+            dataFormat: "list",  //配置data的风格为list
+            response: {message: "msg",statusCode: 0, treeId: "id", parentId: "parentId", title: "deptName"},  //修改response中返回数据的定义
+            url: rootPath + "/SysDepartmentController/list",
+            menubar:true,
+            height: "full-150",
+            width: "80%"
+        });
 
         //table表单列表
         table.render({
@@ -100,6 +144,18 @@
             }
         });
 
+        // 绑定节点点击事件
+        dtree.on("node(organizationTree)", function(obj) {
+            var val = '';
+            for(var i = 0,l = obj.childParams.length;i < l;i++) {
+                val += obj.childParams[i].nodeId;
+                val += ',';
+            }
+
+            val = val + obj.param.nodeId;
+            table.reload('user-table', {url: MODULE_PATH + '/dept/list?deptIds=' + val});
+        });
+
         //table图标事件绑定
         table.on('tool(user-table)', function (obj) {
             if (obj.event === 'remove') {
@@ -124,18 +180,17 @@
 
         //查询按钮绑定
         form.on('submit(role-query)', function (data) {
-            table.reload('user-table', {where: data.field})
+            table.reload('user-table', {url: MODULE_PATH + '/list', where: data.field});
             return false;
         });
 
-
         //添加
         window.add = function () {
             layer.open({
                 type: 2,
                 title: '新增',
                 shade: 0.1,
-                area: ['500px', '500px'],
+                area: ['950px', '700px'],
                 content: MODULE_PATH + '/add'
             });
         }
@@ -145,18 +200,18 @@
                 type: 2,
                 title: '修改',
                 shade: 0.1,
-                area: ['500px', '500px'],
+                area: ['950px', '600px'],
                 content: MODULE_PATH + '/edit/' + obj.data['id']
             });
         }
 
-        //修改密码
+        //重置密码
         window.editPwd = function (obj) {
             layer.open({
                 type: 2,
-                title: '修改密码',
+                title: '重置密码',
                 shade: 0.1,
-                area: ['500px', '500px'],
+                area: ['650px', '300px'],
                 content: MODULE_PATH + '/editPwd/' + obj.data['id']
             });
         }
diff --git a/src/main/resources/templates/admin/sysUser/person.html b/src/main/resources/templates/admin/sysUser/person.html
index 388cd53..0d0d5b6 100644
--- a/src/main/resources/templates/admin/sysUser/person.html
+++ b/src/main/resources/templates/admin/sysUser/person.html
@@ -125,9 +125,13 @@
 
                                     <div class="layui-form-item" style="padding-top: 20px">
                                         <div class="layui-input-block">
-                                            <button class="pear-btn pear-btn-primary pear-btn-sm" lay-filter="userInfoSubmit" lay-submit>
+                                            <button class="pear-btn pear-btn-primary pear-btn-md" lay-filter="userInfoSubmit" lay-submit>
                                                 <i class="layui-icon layui-icon-ok"></i>
-                                                更新基本信息
+												提交
+                                            </button>
+                                            <button class="pear-btn pear-btn-danger pear-btn-md del">
+                                                <i class="layui-icon layui-icon-close"></i>
+                                                关闭
                                             </button>
                                         </div>
                                     </div>
@@ -161,9 +165,13 @@
 
                                     <div class="layui-form-item" style="padding-top: 20px">
                                         <div class="layui-input-block">
-                                            <button class="pear-btn pear-btn-primary pear-btn-sm" lay-filter="userPasswdSubmit" lay-submit>
+                                            <button class="pear-btn pear-btn-primary pear-btn-md" lay-filter="userPasswdSubmit" lay-submit>
                                                 <i class="layui-icon layui-icon-ok"></i>
-                                                更新密码
+                                                提交
+                                            </button>
+                                            <button class="pear-btn pear-btn-danger pear-btn-sm del">
+                                                <i class="layui-icon layui-icon-close"></i>
+                                                关闭
                                             </button>
                                         </div>
                                     </div>
@@ -253,6 +261,12 @@
                 }
             });
         });
+
+        //关闭
+        $(".del").click(function(){
+            parent.layui.tab.delCurrentTabByElem('content',function(id){
+            });
+        })
     });
 </script>
 </body>
-- 
Gitee


From dc9c178b8949017ee891d96c01f8da49f5277b1b Mon Sep 17 00:00:00 2001
From: zhaonengzhi <zhaonengzhi@foxmail.com>
Date: Wed, 25 Aug 2021 14:35:26 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/admin/images/favicon.ico    | Bin 0 -> 4286 bytes
 src/main/resources/templates/include.html        |   1 +
 src/main/resources/templates/index.html          |   1 +
 src/main/resources/templates/login.html          |   8 +++++---
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/static/admin/images/favicon.ico

diff --git a/src/main/resources/static/admin/images/favicon.ico b/src/main/resources/static/admin/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..12098c2d006d10aef946f090dee8368509901c21
GIT binary patch
literal 4286
zcmb`JZBSI#8OQIvc8s;W%G<gu%YvCsKG=?v51oGKL?_cuTcR;lW5hISj3&{lNlZ!<
z5P<-i1$h%UM}qG}6Jq-zlXh%M2&KeE#J6aS#)QyH?M#Qe!*mRuy?Z%N|K}`sT|lgz
zcAdX>@7>+|d(Qv)Kj)%pI{x{5n*3jTJ4w^hHBEZ}!X<4UB(MKJUuJ_b&D?GH2Lncx
z$&3wy&Bh{gpYcQUfZ;I@=~K-k#{Y~<{xfMwf1;^(x>2ysm}=G=wPvHi%stQ>P&2g8
zV1oyYCiAdfI@oGFYaY|*o9`HN%y;#4^Z0*P(~NG)OX{TBgb&Ge#~Nyk)xlaY8=xjA
z0PTfZp#9Jxs1-U2y`u-rHeI&lo?fY^=({sMrU3XXp`9L;Kf<{?|HN<R;QrmX{|8v_
z@nD_a8LT&ciy96_y<p(I3Be2VAan$J3p!?OGT)x^ANgr#DK7OiRe{GOKmLzYp43ID
zIPc5-I5>QxdAg1J6YfuDqfWuyP(Zg$rVp8W^?tKiKa0=XQD+;}j7&IQ1W<?PZUwk5
z3M1p3cpiKf!)M4r=Zup?DW{0ueQP0y*95Q0l<Yc4*3ksLp%eIIwm|!#Lpn#DZK@ye
zV(_rO!aO{A4rX4WhcnI-8^dp>uEb73DSsitbz1p{HV&@|xdY#zU^Te4P(38;*#qug
z=uK#!lyOC6Q|97;(TJX4LMOgFSIO)CjGD&sMH}*GL6q_d_`O8gXTGrp8scr_U-8YI
zVEUn5ko2Mf8ta9H`Dj(yjO0S)DYgP{A5HUoAxgn#xA~$4{U1!|Ac_ZH`k!`&$aO(b
z>yhO=SOb0?^g4J|kgQ|87XhrFDV>d(Q$KnXoonB9(!5{O3ePoSv3$(`W$-ESBO<x}
zq%J|}=fMAzD8J)<u6Ta<FI5h91+)X2;00<77{i#67W6AJr_A_~vwq(I{lME#ES3+i
zKLDSQy9gg1Bz!0c*(79yaxUGn`}}EEWZmGGf-ChJbSE#6mtcd@g`Tm|IW2)7Du_9M
zr`lM4`dK=P>~qEMLJjaB(gT6~f&Up%<`trrBWrnd-I84lZIAT=?`3alAeoDLBZ!_g
zqi2ylYqv35dH{Zj!^gdwvGyC_Q!GEy1A%LT+?R<wUl1+s{)n5~<l3ch|E*9F<Xn?p
zRN}Lpkj#b5XSIGJSZ%Q2F4RzOY(h<1&HycQ_^u1|o}4qq??w%B{m~u>)dTlsLFg6b
zd}Y~JD?C=P822xMUX=o)5OTaI!?g;i3VIzm@EZfj2*Y~@F9PN+!;SvWariSYiGx_b
zEwhgOKjMMp%N%xq-!3yKDC<ii{D$_lzQ7f?5chZL*baUfB-ih-r3aE<4edY=s`PT4
zm*d>!yDk!NuRtV!f?@Cfr{YiOL1g`k--mtRuS5%aPx0W(;1uBgTc9Gy@n6nFC8TBo
z*PVH7Fb<<G4LMaKpysci3Z49?ou*G!52Oc}f!jS0=!^7T5ayM#uM_3o5Ok>|mj_=0
z=M^wy9a|w;hwO>WhROjxSNjyscNrYd%`wjb+;54)Pd`H^<X$(v2Qqt^pTqmFBHp8K
z<ojA!-o5|e4_2Qa{z+x~@RMb&)`pU%n`K4CR%6k+;iH9*^Ap8$t)7zEH?Nhs?19R7
zYjEechT;1hXa40et51C2;b)v9l>z0!Xa?jg$bCoVK1+K4H?Xe@JMoy{->w^>>D40?
zw_}77Ub88&#HQpzn`RV*DRpz0(l>=EW1U4a*IMLT{SE)#svDh>8T-Qi8wX#TqWd2*
z5S;_Cu_vgRSGj}t=ozK{PVnh9;O-ou_zG}K!7T#!Rd8PpQ`!sQ{tDdZEOM{5$g?6u
zS<6G@eS#m4Wy|;AYgpTsD8EOXS3N)mQ+p^f^H;I<QSV(R1^<qJ#E!4DDWS}!q;24C
z36twtuvUdAbCm_*xH3eZr@(zuamlxY_xcv|gz<cN4*sGj|FrnM<V(%G2>$2r9y2e!
z_goZKynn<>C<j-09i|j`?Oq+CSwH18>t_+&FONSTRo*R{m3Ql3v+{UT?gCzr^B7-`
zI#y&a<qtWv;Q2fIHlOxm4sAROqx-G&KI@vWlN(2P;`Xs#yPmfwH_u_A4*C9(G2-C1
zfy=;U;4*JMXYi#qhCdB_=lLJN99)r^bN1V;FR}k09N|gD5wBBTL62XIWGiPOn2$(-
zIe&tzoQ3>-c+aw*0CRbWWjz&Qo|T~{^l8i-VE->r&;MSUpK(D{$!A^WsQ0e-MuwBO
z!s}lnUoRoo8!eLS&RzoU{1D|XkmBQI=lp_qc$cZQGGvftJ{@B2XDo(!nCD(=Im=f^
z@E!m^4}WJESo@FFvktj)cMG1fC2U9MX+3g{ta<ZCxsQT7K_T)j4)tXH5^GglFxObj
z^&GU$TI5<69>X4gf?DF>{msnt!b;s1ww!sw?+Nv*Ov6_~Pbqqo?;i^(`Idw(!()co
zlWS%0ieVmE`o{2@jE&ahe}u*qg6I6h8CBt~^bHZO-D@z%m@7F?@HIyA{I<aEcRv$q
zhDUO(48LcnpP_G?q3GXUF{nx3W~{g7;Xch+M*u$7BR}=Xu$<#wWU43oasEm6($Goo
zvQRhr(S_PN@csSxom?wJMj7@ahTN1uag&1X;RD}Nu7S5q<`^uddV432H>tHU%m~AN
z$gm&#legNb_kg(TSF-X$56bz$p2o1hMRGje<IQTV4ErI&e$22()#I7qyX%eb@k8Y4
zq0FaMjswVHBRsCh9M+`0X!+rB75uFLw-nqGFblCa7hs=Mf9FkxAe)HnDI|n8*B;X5
z@_AY|*R<>*O-t;DIyLP+sZvPOv?(}B>7!Dgb&h^V9{Wdshoc7RH}QRe>rf)$zErBs
NB@PW~+iB=N`Zw$T&W->8

literal 0
HcmV?d00001

diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html
index 027bb72..5a2797b 100644
--- a/src/main/resources/templates/include.html
+++ b/src/main/resources/templates/include.html
@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="keywords" content="">
     <meta name="description" content="">
+    <link rel="shortcut icon" th:href="@{/static/admin/images/favicon.ico}" type="image/x-icon">
     <title th:text="${title}"></title>
     <link rel="stylesheet" th:href="@{/static/component/pear/css/pear.css}">
 </head>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index fafe9d9..5b6003c 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
+<link rel="shortcut icon" th:href="@{/static/admin/images/favicon.ico}" type="image/x-icon">
 <head>
 <meta charset="UTF-8">
 <title>前端展示</title>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 404f563..af1513b 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <link rel="shortcut icon" th:href="@{/static/admin/images/favicon.ico}" type="image/x-icon">
     <th:block th:include="include :: header('登录')"/>
     <link rel="stylesheet" th:href="@{/static/admin/css/other/login.css}" />
 </head>
@@ -15,13 +16,13 @@
         </div>
     </div>
     <div class="layui-form-item">
-        <input name="username" type="text" placeholder="账 户 : admin " value="admin" hover class="layui-input"  />
+        <input name="username" type="text" placeholder="账 户 : admin " value="admin" hover class="layui-input" lay-verify="required" required />
     </div>
     <div class="layui-form-item">
-        <input name="password" type="password" placeholder="密 码 : admin " value="admin" hover class="layui-input"  />
+        <input name="password" type="password" placeholder="密 码 : admin " value="admin" hover class="layui-input" lay-verify="required" required />
     </div>
     <div class="layui-form-item">
-        <input placeholder="验证码 : " name="captcha" hover class="code layui-input layui-input-inline"  />
+        <input placeholder="验证码 : " name="captcha" hover class="code layui-input layui-input-inline"  lay-verify="required" required/>
         <img th:src="@{/captcha/captchaImage?type=char}" class="codeImage" id="captchaImage"/>
     </div>
     <div class="layui-form-item">
@@ -39,6 +40,7 @@
         let form = layui.form;
         let $ = layui.jquery;
         let layer = layui.layer;
+
         form.on('submit(login)', function(data){
         	$(".login").attr("disabled","disabled")
             let loader = layer.load();
-- 
Gitee


From 427eba39a1aada121fd6c0a2e8c15d2822cd6b34 Mon Sep 17 00:00:00 2001
From: "zhaonengzhi@foxmail.com" <zhaonengzhi@foxmail.com>
Date: Thu, 4 Aug 2022 19:50:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E6=8D=95=E8=8E=B7=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhaonengzhi@foxmail.com <zhaonengzhi@foxmail.com>
---
 ...se.wst.common.project.facet.core.prefs.xml |   7 +
 .../com/fc/v2/controller/AdminController.java |  16 +-
 .../v2/mapper/auto/TSysPermissionMapper.java  |   8 +
 .../java/com/fc/v2/model/custom/Tablepar.java |   5 -
 .../fc/v2/service/ITSysPermissionService.java | 249 +++++++++---------
 .../v2/service/impl/TSysAreaServiceImpl.java  |   8 +-
 .../impl/TSysQuartzJobLogServiceImpl.java     |   2 +
 .../java/com/fc/v2/shiro/util/ShiroUtils.java |  10 +-
 src/test/java/GetUserMenu.java                |  19 ++
 9 files changed, 184 insertions(+), 140 deletions(-)
 create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.prefs.xml
 create mode 100644 src/test/java/GetUserMenu.java

diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..6ee36ae
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+<root>
+  <facet id="me.spring">
+    <node name="libprov">
+      <attribute name="provider-id" value="spring-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>
diff --git a/src/main/java/com/fc/v2/controller/AdminController.java b/src/main/java/com/fc/v2/controller/AdminController.java
index ddf17c3..45a8b2a 100644
--- a/src/main/java/com/fc/v2/controller/AdminController.java
+++ b/src/main/java/com/fc/v2/controller/AdminController.java
@@ -42,6 +42,12 @@ public class AdminController extends BaseController {
 
     private String prefix = "admin";
 
+    /**
+     * index首页
+     *
+     * @param request
+     * @return
+     */
     @ApiOperation(value = "首页", notes = "首页")
     @GetMapping({"", "/index"})
     public String index(HttpServletRequest request) {
@@ -52,16 +58,18 @@ public class AdminController extends BaseController {
         return prefix + "/index";
     }
 
-
+    /**
+     * 获取菜单
+     *
+     * @return
+     */
     @ApiOperation(value = "获取登录用户菜单栏", notes = "获取登录用户菜单栏")
     @GetMapping("/getUserMenu")
     @ResponseBody
     public List<SysMenu> getUserMenu() {
-        List<SysMenu> sysMenus = sysPermissionService.getSysMenus(ShiroUtils.getUserId());
-        return sysMenus;
+        return sysPermissionService.getSysMenus(ShiroUtils.getUserId());
     }
 
-
     /**
      * 请求到登陆界面
      *
diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java
index cbfab0e..6751f6b 100644
--- a/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java
+++ b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java
@@ -4,6 +4,7 @@ package com.fc.v2.mapper.auto;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fc.v2.model.auto.TSysPermission;
+import com.fc.v2.model.custom.SysMenu;
 
 /**
  * 权限Mapper接口
@@ -36,4 +37,11 @@ public interface TSysPermissionMapper extends BaseMapper<TSysPermission> {
 	 */
 	public List<TSysPermission> queryRoleId(Long roleid);
 
+	/**
+	 * 根据用户id查询菜单
+	 *
+	 * @param userId
+	 * @return
+	 */
+	public List<SysMenu> findAllByIdMenu(Long userId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/fc/v2/model/custom/Tablepar.java b/src/main/java/com/fc/v2/model/custom/Tablepar.java
index e7a3a7a..f6c8e0e 100644
--- a/src/main/java/com/fc/v2/model/custom/Tablepar.java
+++ b/src/main/java/com/fc/v2/model/custom/Tablepar.java
@@ -1,12 +1,7 @@
 package com.fc.v2.model.custom;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fc.v2.util.ServletUtils;
 import com.fc.v2.util.StringUtils;
-import sun.security.pkcs11.wrapper.Constants;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.spi.http.HttpContext;
 
 /**
  * boostrap table post 参数
diff --git a/src/main/java/com/fc/v2/service/ITSysPermissionService.java b/src/main/java/com/fc/v2/service/ITSysPermissionService.java
index 828a33f..07adb96 100644
--- a/src/main/java/com/fc/v2/service/ITSysPermissionService.java
+++ b/src/main/java/com/fc/v2/service/ITSysPermissionService.java
@@ -2,9 +2,9 @@
 package com.fc.v2.service;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
-
 import com.fc.v2.model.auto.TSysPermission;
 import com.fc.v2.model.custom.SysMenu;
 import com.fc.v2.model.custom.SysPower;
@@ -12,133 +12,130 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 
 /**
  * 权限Service接口
- * 
+ *
  * @author zhaonz
  * @date 2021-08-05
  */
 public interface ITSysPermissionService extends IService<TSysPermission> {
-	/**
-	 * 查询权限
-	 * 
-	 * @param id 权限ID
-	 * @return 权限
-	 */
-	public TSysPermission selectTSysPermissionById(Long id);
-
-	/**
-	 * 查询权限
-	 *
-	 * @param ids 权限ID
-	 * @return 权限
-	 */
-	public List<TSysPermission> selectTSysPermissionByIds(List<Long> ids);
-
-	/**
-	 * 查询权限列表
-	 * 
-	 * @param queryWrapper 权限
-	 * @return 权限集合
-	 */
-	public List<TSysPermission> selectTSysPermissionList(Wrapper<TSysPermission> queryWrapper);
-
-	/**
-	 * 查询权限列表
-	 *
-	 * @param tSysPermission 权限
-	 * @return 权限集合
-	 */
-	public List<TSysPermission> selectTSysPermissionList(TSysPermission tSysPermission);
-
-	/**
-	 * 新增权限
-	 * 
-	 * @param tSysPermission 权限
-	 * @return 结果
-	 */
-	public int insertTSysPermission(TSysPermission tSysPermission);
-
-	/**
-	 * 修改权限
-	 * 
-	 * @param tSysPermission 权限
-	 * @return 结果
-	 */
-	public int updateTSysPermission(TSysPermission tSysPermission);
-
-	/**
-	 * 批量删除权限
-	 * 
-	 * @param ids 需要删除的数据ID
-	 * @return 结果
-	 */
-	public ImmutablePair<Integer, String> deleteTSysPermissionByIds(String ids);
-
-	/**
-	 * 删除权限信息
-	 * 
-	 * @param id 权限ID
-	 * @return 结果
-	 */
-	public int deleteTSysPermissionById(Long id);
-
-	/**
-	 * 检查权限name
-	 *
-	 * @param tsysPermission
-	 * @return
-	 */
-	public int checkNameUnique(TSysPermission tsysPermission);
-
-	/**
-	 * 检查权限URL
-	 *
-	 * @param tsysPermission
-	 * @return
-	 */
-	public int checkURLUnique(TSysPermission tsysPermission);
-
-	/**
-	 * 检查权限perms字段
-	 *
-	 * @param tsysPermission
-	 * @return
-	 */
-	public int checkPermsUnique(TSysPermission tsysPermission);
-
-	/**
-	 *
-	 * @param roleId
-	 * @return
-	 */
-	public List<SysPower> getRolePower(Long roleId);
-
-	/**
-	 *
-	 * @param userid
-	 * @return
-	 */
-	public List<TSysPermission> getall(Long userid);
-
-	/**
-	 * 修改权限状态展示或者不展示
-	 *
-	 * @param tSysPermission
-	 * @return
-	 */
-	public int updateVisible(TSysPermission tSysPermission);
-
-	/**
-	 * 根据用户id查询菜单栏
-	 *
-	 * @param userId
-	 * @return
-	 */
-	public List<SysMenu> getSysMenus(Long userId);
-
-	/**
-	 *
-	 * @param rolid
-	 * @return
-	 */
-	public List<TSysPermission> queryRoleId(Long rolid);
+    /**
+     * 查询权限
+     *
+     * @param id 权限ID
+     * @return 权限
+     */
+    public TSysPermission selectTSysPermissionById(Long id);
+
+    /**
+     * 查询权限
+     *
+     * @param ids 权限ID
+     * @return 权限
+     */
+    public List<TSysPermission> selectTSysPermissionByIds(List<Long> ids);
+
+    /**
+     * 查询权限列表
+     *
+     * @param queryWrapper 权限
+     * @return 权限集合
+     */
+    public List<TSysPermission> selectTSysPermissionList(Wrapper<TSysPermission> queryWrapper);
+
+    /**
+     * 查询权限列表
+     *
+     * @param tSysPermission 权限
+     * @return 权限集合
+     */
+    public List<TSysPermission> selectTSysPermissionList(TSysPermission tSysPermission);
+
+    /**
+     * 新增权限
+     *
+     * @param tSysPermission 权限
+     * @return 结果
+     */
+    public int insertTSysPermission(TSysPermission tSysPermission);
+
+    /**
+     * 修改权限
+     *
+     * @param tSysPermission 权限
+     * @return 结果
+     */
+    public int updateTSysPermission(TSysPermission tSysPermission);
+
+    /**
+     * 批量删除权限
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public ImmutablePair<Integer, String> deleteTSysPermissionByIds(String ids);
+
+    /**
+     * 删除权限信息
+     *
+     * @param id 权限ID
+     * @return 结果
+     */
+    public int deleteTSysPermissionById(Long id);
+
+    /**
+     * 检查权限name
+     *
+     * @param tsysPermission
+     * @return
+     */
+    public int checkNameUnique(TSysPermission tsysPermission);
+
+    /**
+     * 检查权限URL
+     *
+     * @param tsysPermission
+     * @return
+     */
+    public int checkURLUnique(TSysPermission tsysPermission);
+
+    /**
+     * 检查权限perms字段
+     *
+     * @param tsysPermission
+     * @return
+     */
+    public int checkPermsUnique(TSysPermission tsysPermission);
+
+    /**
+     * @param roleId
+     * @return
+     */
+    public List<SysPower> getRolePower(Long roleId);
+
+    /**
+     * @param userid
+     * @return
+     */
+    public List<TSysPermission> getall(Long userid);
+
+    /**
+     * 修改权限状态展示或者不展示
+     *
+     * @param tSysPermission
+     * @return
+     */
+    public int updateVisible(TSysPermission tSysPermission);
+
+    /**
+     * 根据用户id查询菜单栏
+     *
+     * @param userId
+     * @return
+     */
+    public List<SysMenu> getSysMenus(Long userId);
+
+    /**
+     * @param rolid
+     * @return
+     */
+    public List<TSysPermission> queryRoleId(Long rolid);
 }
diff --git a/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java
index 3ba9fcd..db19dee 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java
@@ -65,10 +65,10 @@ public class TSysAreaServiceImpl  extends ServiceImpl<TSysAreaMapper, TSysArea>
      */
     @Override
     public List<TSysArea> selectTSysAreaList(TSysArea tSysArea) {
-    	Map<String, Object>  map = BeanUtil.beanToMap(tSysArea, true, true);
-    	QueryWrapper<TSysArea> queryWrapper = new QueryWrapper<TSysArea>();
-    	queryWrapper.allEq(map,false);
-    	return this.baseMapper.selectList(queryWrapper);
+        Map<String, Object> map = BeanUtil.beanToMap(tSysArea, true, true);
+        QueryWrapper<TSysArea> queryWrapper = new QueryWrapper<TSysArea>();
+        queryWrapper.allEq(map, false);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     /**
diff --git a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java
index 4d514eb..eeaded2 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java
@@ -7,6 +7,7 @@ import java.util.Arrays;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -81,6 +82,7 @@ public class TSysQuartzJobLogServiceImpl  extends ServiceImpl<TSysQuartzJobLogMa
     @Override
     public int insertTSysQuartzJobLog(TSysQuartzJobLog tSysQuartzJobLog)
     {
+        tSysQuartzJobLog.setId(IdWorker.getId());
         return this.baseMapper.insert(tSysQuartzJobLog);
     }
 
diff --git a/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java b/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java
index 6ea9a11..6998301 100644
--- a/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java
+++ b/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java
@@ -2,6 +2,7 @@ package com.fc.v2.shiro.util;
 
 import com.fc.v2.model.auto.TSysUser;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
 import org.apache.shiro.mgt.RealmSecurityManager;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.PrincipalCollection;
@@ -116,13 +117,20 @@ public class ShiroUtils {
 
     /**
      * 获取登录用户name
+     * 防止定时获取不到用户名，捕获UnavailableSecurityManagerException异常
      * @return
      * @author fuce
      * @Date 2019年11月21日 上午9:58:48
      */
     public static String getLoginName()
     {
-        TSysUser tsysUser = getUser();
+        TSysUser tsysUser;
+        try {
+            tsysUser = getUser();
+        } catch (UnavailableSecurityManagerException e){
+            return "Task";
+        }
+
         if (tsysUser == null){
             throw new RuntimeException("用户不存在！");
         }
diff --git a/src/test/java/GetUserMenu.java b/src/test/java/GetUserMenu.java
new file mode 100644
index 0000000..a9af939
--- /dev/null
+++ b/src/test/java/GetUserMenu.java
@@ -0,0 +1,19 @@
+import com.fc.v2.model.custom.SysMenu;
+import com.fc.v2.service.ITSysPermissionService;
+import com.fc.v2.shiro.util.ShiroUtils;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public class GetUserMenu {
+
+    @Autowired
+    public ITSysPermissionService sysPermissionService;
+
+    @Test
+    public void getMenu(){
+        List<SysMenu> sysMenus = sysPermissionService.getSysMenus(ShiroUtils.getUserId());
+        System.out.println(sysMenus.toArray());
+    }
+}
-- 
Gitee