From edb2ca222b881206d63217696c624708c49e1f73 Mon Sep 17 00:00:00 2001
From: yeqifu <1784525940@qq.com>
Date: Mon, 24 Feb 2020 22:05:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=AA=E4=BA=BA=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E5=9B=BE=E7=89=87=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/controller/GoodsController.java       |  2 +-
 .../com/yeqifu/sys/common/AppFileUtils.java   |  2 +-
 .../java/com/yeqifu/sys/common/Constast.java  | 10 +++-
 .../java/com/yeqifu/sys/common/ResultObj.java |  7 ++-
 .../yeqifu/sys/controller/UserController.java | 33 ++++++++++++-
 .../templates/system/role/roleManager.html    |  2 +-
 .../templates/system/user/userInfo.html       | 47 ++++++++++++++++---
 .../templates/system/user/userManager.html    |  4 +-
 8 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/yeqifu/bus/controller/GoodsController.java b/src/main/java/com/yeqifu/bus/controller/GoodsController.java
index 40a939e..74874af 100644
--- a/src/main/java/com/yeqifu/bus/controller/GoodsController.java
+++ b/src/main/java/com/yeqifu/bus/controller/GoodsController.java
@@ -94,7 +94,7 @@ public class GoodsController {
     public ResultObj updateGoods(GoodsVo goodsVo){
         try {
             //商品图片不是默认图片
-            if (!(goodsVo.getGoodsimg()!=null&&goodsVo.getGoodsimg().equals(Constast.DEFAULT_IMG))){
+            if (!(goodsVo.getGoodsimg()!=null&&goodsVo.getGoodsimg().equals(Constast.DEFAULT_IMG_GOODS))){
                 if (goodsVo.getGoodsimg().endsWith("_temp")){
                     String newName = AppFileUtils.renameFile(goodsVo.getGoodsimg());
                     goodsVo.setGoodsimg(newName);
diff --git a/src/main/java/com/yeqifu/sys/common/AppFileUtils.java b/src/main/java/com/yeqifu/sys/common/AppFileUtils.java
index d3b775f..de5c0c1 100644
--- a/src/main/java/com/yeqifu/sys/common/AppFileUtils.java
+++ b/src/main/java/com/yeqifu/sys/common/AppFileUtils.java
@@ -97,7 +97,7 @@ public class AppFileUtils {
      */
     public static void removeFileByPath(String oldPath) {
         //图片的路径不是默认图片的路径
-        if (!oldPath.equals(Constast.DEFAULT_IMG)){
+        if (!oldPath.equals(Constast.DEFAULT_IMG_GOODS)){
             File file = new File(UPLOAD_PATH,oldPath);
             if (file.exists()){
                 file.delete();
diff --git a/src/main/java/com/yeqifu/sys/common/Constast.java b/src/main/java/com/yeqifu/sys/common/Constast.java
index 988a008..1aa1163 100644
--- a/src/main/java/com/yeqifu/sys/common/Constast.java
+++ b/src/main/java/com/yeqifu/sys/common/Constast.java
@@ -44,7 +44,15 @@ public class Constast {
     /**
      * 商品默认图片
      */
-    public static final String DEFAULT_IMG= "/images/noDefaultImage.jpg";
+    public static final String DEFAULT_IMG_GOODS = "/images/noDefaultImage.jpg";
 
+    /**
+     * hash散列次数
+     */
     public static final Integer HASHITERATIONS = 2;
+
+    /**
+     * 用户默认图片
+     */
+    public static final String DEFAULT_IMG_USER="/images/defaultusertitle.jpg";
 }
diff --git a/src/main/java/com/yeqifu/sys/common/ResultObj.java b/src/main/java/com/yeqifu/sys/common/ResultObj.java
index 7b316d6..1961bf0 100644
--- a/src/main/java/com/yeqifu/sys/common/ResultObj.java
+++ b/src/main/java/com/yeqifu/sys/common/ResultObj.java
@@ -13,6 +13,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class ResultObj {
 
+    private Integer code;
+    private String msg;
+
     public static final ResultObj LOGIN_SUCCESS=new ResultObj(Constast.OK,"登陆成功");
     public static final ResultObj LOGIN_ERROR_PASS=new ResultObj(Constast.ERROR,"用户名或密码错误");
     public static final ResultObj LOGIN_ERROR_CODE=new ResultObj(Constast.ERROR,"验证码错误");
@@ -39,8 +42,4 @@ public class ResultObj {
     public static final ResultObj DELETE_ERROR_NEWS = new ResultObj(Constast.ERROR,"删除用户失败，该用户是其他用户的直属领导，请先修改该用户的下属的直属领导，再进行删除操作");
     public static final ResultObj DELETE_QUERY = new ResultObj();
 
-
-    private Integer code;
-    private String msg;
-
 }
diff --git a/src/main/java/com/yeqifu/sys/controller/UserController.java b/src/main/java/com/yeqifu/sys/controller/UserController.java
index 0d108e4..efaf688 100644
--- a/src/main/java/com/yeqifu/sys/controller/UserController.java
+++ b/src/main/java/com/yeqifu/sys/controller/UserController.java
@@ -144,8 +144,10 @@ public class UserController {
             //设置盐
             String salt = IdUtil.simpleUUID().toUpperCase();
             userVo.setSalt(salt);
-            //设置密码
+            //设置默认密码
             userVo.setPwd(new Md5Hash(Constast.USER_DEFAULT_PWD,salt,2).toString());
+            //设置用户默认头像
+            userVo.setImgpath(Constast.DEFAULT_IMG_USER);
             userService.save(userVo);
             return ResultObj.ADD_SUCCESS;
         } catch (Exception e) {
@@ -320,8 +322,37 @@ public class UserController {
     public User getNowUser(){
         //1.获取当前session中的user
         User user = (User) WebUtils.getSession().getAttribute("user");
+        System.out.println("*****************************************");
+        System.out.println(user);
         return user;
     }
 
+
+    /**
+     * 修改用户
+     * @param userVo
+     * @return
+     */
+    @RequestMapping("updateUserInfo")
+    public ResultObj updateUserInfo(UserVo userVo){
+        try {
+            //用户头像不是默认图片
+            if (!(userVo.getImgpath()!=null&&userVo.getImgpath().equals(Constast.DEFAULT_IMG_GOODS))){
+                if (userVo.getImgpath().endsWith("_temp")){
+                    String newName = AppFileUtils.renameFile(userVo.getImgpath());
+                    userVo.setImgpath(newName);
+                    //删除原先的图片
+                    String oldPath = userService.getById(userVo.getId()).getImgpath();
+                    AppFileUtils.removeFileByPath(oldPath);
+                }
+            }
+            userService.updateById(userVo);
+            return ResultObj.UPDATE_SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultObj.UPDATE_ERROR;
+        }
+    }
+
 }
 
diff --git a/src/main/resources/templates/system/role/roleManager.html b/src/main/resources/templates/system/role/roleManager.html
index 8a9fb2a..6036e18 100644
--- a/src/main/resources/templates/system/role/roleManager.html
+++ b/src/main/resources/templates/system/role/roleManager.html
@@ -281,7 +281,7 @@
 
         //删除
         function deleteRole(data) {
-            layer.confirm('你确定要删除【'+data.name+'】这条数据吗？',{icon: 3,title:'提示'},function (index) {
+            layer.confirm('你确定要删除【'+data.name+'】这条数据吗？如果您删除该角色，那么所有拥有该角色的用户将没有角色，请重新给这些用户分配角色！',{icon: 3,title:'提示'},function (index) {
                 $.post("/role/deleteRole",{id:data.id},function (res) {
                     if (res.code==200){
                         tableIns.reload({
diff --git a/src/main/resources/templates/system/user/userInfo.html b/src/main/resources/templates/system/user/userInfo.html
index 6f78569..ca96f3c 100644
--- a/src/main/resources/templates/system/user/userInfo.html
+++ b/src/main/resources/templates/system/user/userInfo.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:type="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="utf-8">
     <title>个人资料</title>
@@ -13,9 +13,10 @@
     <link rel="stylesheet" href="/resources/css/public.css" media="all" />
 </head>
 <body class="childrenBody">
-<form class="layui-form layui-row">
+<form class="layui-form layui-row" method="post">
     <div class="layui-col-md3 layui-col-xs12 user_right">
-        <div class="layui-upload-list">
+        <div class="layui-upload-list userFace">
+            <input type="hidden" name="imgpath" id="imgpath">
             <img class="layui-upload-img layui-circle userFaceBtn userAvatar" id="userFace">
         </div>
         <button type="button" class="layui-btn layui-btn-primary userFaceBtn"><i class="layui-icon">&#xe67c;</i> 掐指一算，我要换一个头像了</button>
@@ -25,6 +26,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">用户名</label>
             <div class="layui-input-block">
+                <input type="hidden" class="id" name="id">
                 <input type="text" value="" id="name" th:value="${session.user.name}" disabled class="layui-input layui-disabled">
             </div>
         </div>
@@ -110,12 +112,12 @@
                 <textarea placeholder="请输入内容" class="layui-textarea myself"></textarea>
             </div>
         </div>-->
-        <!--<div class="layui-form-item">
+        <div class="layui-form-item">
             <div class="layui-input-block">
                 <button class="layui-btn" lay-submit="" lay-filter="changeUser">立即提交</button>
-                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                <!--<button type="reset" class="layui-btn layui-btn-primary">重置</button>-->
             </div>
-        </div>-->
+        </div>
     </div>
 </form>
 <script type="text/javascript" src="/resources/layui/layui.js"></script>
@@ -124,16 +126,19 @@
 
 <script type="text/javascript">
 
-    layui.use(['jquery','upload'],function () {
+    layui.use(['jquery','upload','form'],function () {
 
         var $ = layui.jquery;
         var upload = layui.upload;
+        var form = layui.form;
 
         //获得当前用户的登陆名
         var loginname = $("#loginname");
         $.get('/user/getNowUser',function (res) {
             var name = $("#name");
             name.val(res.name);
+            var id = $(".id");
+            id.val(res.id);
             var loginname = $("#loginname");
             loginname.val(res.loginname);
             var remark = $("#remark");
@@ -144,9 +149,37 @@
             var imgpath = res.imgpath;
             $('#userFace').attr('src','/file/showImageByPath?path='+imgpath);
 
+        });
 
 
+        //上传头像
+        upload.render({
+            elem: '.userFaceBtn',
+            url: '/file/uploadFile',
+            acceptMime:'image/*',
+            field:'mf',
+            method : "post",
+            done: function(res, index, upload){
+                var path=res.path;
+                $('#userFace').attr('src','/file/showImageByPath?path='+path);
+                $('.userFace').css("background","#fff");
+                //给隐藏域赋值
+                $("#imgpath").val(path);
+            }
         });
+
+        //提交个人资料
+        form.on("submit(changeUser)",function(data){
+            var index = layer.msg('提交中，请稍候',{icon: 16,time:false,shade:0.8});
+            $.post("/user/updateUserInfo", data.field, function (res) {
+                layer.msg(res.msg);
+            });
+            setTimeout(function(){
+                layer.close(index);
+                layer.msg("提交成功！");
+            },2000);
+            return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
+        })
     });
 
 
diff --git a/src/main/resources/templates/system/user/userManager.html b/src/main/resources/templates/system/user/userManager.html
index dc6e9e2..1f8814f 100644
--- a/src/main/resources/templates/system/user/userManager.html
+++ b/src/main/resources/templates/system/user/userManager.html
@@ -257,7 +257,9 @@
                 {field: 'remark', title: '用户备注', align: 'center', width: '120'},
                 {field: 'address', title: '用户地址', align: 'center', width: '100'},
                 {field: 'hiredate', title: '入职时间', align: 'center', width: '160'},
-                {field: 'imgpath', title: '用户头像', align: 'center', width: '160'},
+                {field: 'imgpath', title: '用户头像', align: 'center', width: '160', templet:function(d){
+                        return '<img width=40 height=40 src=/file/showImageByPath?path='+d.imgpath+ ' />';
+                }},
                 {
                     field: 'sex', title: '是否可用', align: 'center', width: '100', templet: function (d) {
                     return d.sex == 1 ? '<font color="blue">男</font>' : '<font color="red">女</font>';