From 141b2377ea86e1d57d71187f04a714fe7642c52d Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Fri, 7 Apr 2023 10:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PageController.java            |  28 +++-
 src/main/resources/static/css/public.css      |   5 +
 .../resources/templates/index_mobile.html     |   2 +-
 .../templates/pages/user/login_back.html      | 139 ------------------
 .../templates/pages/user/userInfo.html        | 105 +++++++++++++
 target/classes/static/css/public.css          |   5 +
 target/classes/templates/index_mobile.html    |   2 +-
 .../templates/pages/user/login_back.html      | 139 ------------------
 8 files changed, 144 insertions(+), 281 deletions(-)
 delete mode 100644 src/main/resources/templates/pages/user/login_back.html
 create mode 100644 src/main/resources/templates/pages/user/userInfo.html
 delete mode 100644 target/classes/templates/pages/user/login_back.html

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index 3906884c..8869520b 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -2354,8 +2354,34 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 用于跳转到个人信息页
+     * @param request
+     * @return
+     */
+    @GetMapping("/userInfo")
+    public ModelAndView userInfo(HttpServletRequest request){
+        ModelAndView mv = new ModelAndView();
+        mv.setViewName("pages/user/userInfo");
+        String token = request.getHeader("user-token");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+        }
+        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+        Administration company = LinkInterfaceUtil.getCompany(userToken.getMaindeparment(), userToken);
+        userToken.setMaindeparmentname(company.getName());
+        mv.addObject("userInfo",userToken);
+        return mv;
+    }
+
+
+    /**
+     * 用于查看用户具体信息
+     * @param request
+     * @return
+     */
     @GetMapping("/account_look")
-    public ModelAndView account_look(Integer id, HttpServletRequest request) {
+    public ModelAndView account_look(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
         mv.setViewName("pages/user/account-look");
         String token = request.getHeader("user-token");
diff --git a/src/main/resources/static/css/public.css b/src/main/resources/static/css/public.css
index ce91bcbb..1b7d493b 100644
--- a/src/main/resources/static/css/public.css
+++ b/src/main/resources/static/css/public.css
@@ -227,3 +227,8 @@ body {
     color: #999;
 }
 
+.userInfo_icon{
+    height: 200px;
+    width: 200px;
+    border-radius: 50%;
+}
diff --git a/src/main/resources/templates/index_mobile.html b/src/main/resources/templates/index_mobile.html
index 7f8c3029..ddc3a955 100644
--- a/src/main/resources/templates/index_mobile.html
+++ b/src/main/resources/templates/index_mobile.html
@@ -146,7 +146,7 @@
                     </a>
                 </div>
                 <div class="layuimini-footer-content-item">
-                    <a href="javascript:;" layuimini-content-href="/welcome" data-title="我的" style="display: inline-block"
+                    <a href="javascript:;" layuimini-content-href="/userInfo" data-title="我的" style="display: inline-block"
                        data-icon="fa fa-window-maximize">
                         <i class="fa fa-user-o fa-lg fa-fw" style=" position: relative; top: -8px; left: 15px;"></i>
                         <span style=" display: inline-block; position: relative; top: 10px;left: -15px; font-size: 14px">我的</span>
diff --git a/src/main/resources/templates/pages/user/login_back.html b/src/main/resources/templates/pages/user/login_back.html
deleted file mode 100644
index f3739e4a..00000000
--- a/src/main/resources/templates/pages/user/login_back.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <title>后台管理-登陆</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="Access-Control-Allow-Origin" content="*">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet"  href="/static/css/public.css">
-    <!--[if lt IE 9]>
-    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
-    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
-    <style>
-        html, body {width: 100%;height: 100%;overflow: hidden}
-        body {background: #1E9FFF;}
-        body:after {content:'';background-repeat:no-repeat;background-size:cover;-webkit-filter:blur(3px);-moz-filter:blur(3px);-o-filter:blur(3px);-ms-filter:blur(3px);filter:blur(3px);position:absolute;top:0;left:0;right:0;bottom:0;z-index:-1;}
-        .layui-container {width: 100%;height: 100%;overflow: hidden}
-        .admin-login-background {width:360px;height:300px;position:absolute;left:50%;top:40%;margin-left:-180px;margin-top:-100px;}
-        .logo-title {text-align:center;letter-spacing:2px;padding:14px 0;}
-        .logo-title h1 {color:#1E9FFF;font-size:25px;font-weight:bold;}
-        .login-form {background-color:#fff;border:1px solid #fff;border-radius:3px;padding:14px 20px;box-shadow:0 0 8px #eeeeee;}
-        .login-form .layui-form-item {position:relative;}
-        .login-form .layui-form-item label {position:absolute;left:1px;top:1px;width:38px;line-height:36px;text-align:center;color:#d2d2d2;}
-        .login-form .layui-form-item input {padding-left:36px;}
-        .captcha {width:60%;display:inline-block;}
-        .captcha-img {display:inline-block;width:34%;float:right;}
-        .captcha-img img {height:34px;border:1px solid #e6e6e6;height:36px;width:100%;}
-    </style>
-</head>
-<body>
-<div class="layui-container">
-    <div class="admin-login-background">
-        <div class="layui-form login-form">
-            <form class="layui-form layui-form-pane" action="">
-                <div class="layui-form-item logo-title">
-                    <h1>仓库管理系统登录</h1>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-icon layui-icon-username" ></label>
-                    <input type="text" name="principal" lay-verify="required|account" placeholder="请输入邮箱" autocomplete="off" class="layui-input" >
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-icon layui-icon-password" ></label>
-                    <input type="password" name="credentials" lay-verify="required|password" placeholder="密码" autocomplete="off" class="layui-input">
-                </div>
-                <!-- 徒有其表的验证码，主要是不想另外弄了 -->
-                <div class="layui-form-item">
-                    <label class="layui-icon layui-icon-vercode" ></label>
-                    <input type="text" name="captcha" value="XSZG" lay-verify="required|captcha" placeholder="图形验证码" autocomplete="off" class="layui-input verification captcha">
-                    <div class="captcha-img">
-                        <img id="captchaPic" src="static/images/captcha.jpg">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <input type="checkbox" name="rememberMe" value="true" lay-skin="primary" title="记住密码">
-                </div>
-                <div class="layui-form-item">
-                    <button class="layui-btn layui-btn layui-btn-normal layui-btn-fluid" lay-submit="" lay-filter="login">登 入</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-<script  src="static/lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
-<script  src="static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script  src="static/lib/jq-module/jquery.particleground.min.js" charset="utf-8"></script>
-<script  src="static/js/cookie.js" charset="utf-8"></script>
-<script>
-    layui.use(['layer','form'], function () {
-        var form = layui.form,
-            layer = layui.layer;
-
-
-        // 登录过期的时候，跳出ifram框架
-        if (top.location != self.location) top.location = self.location;
-
-        // 粒子线条背景
-        $(document).ready(function(){
-            $('.layui-container').particleground({
-                dotColor:'#7ec7fd',
-                lineColor:'#7ec7fd'
-            });
-        });
-
-        // 进行登录操作
-        form.on('submit(login)', function (data) {
-            data = data.field;
-            if (data.principal === '') {
-                layer.msg('用户名不能为空');
-                return false;
-            }
-            if (data.credentials === '') {
-                layer.msg('密码不能为空');
-                return false;
-            }
-            if (data.captcha === '') {
-                layer.msg('验证码不能为空');
-                return false;
-            }
-            data.loginType="email";
-            $.ajax({
-                url:"/login",
-                type:'post',
-                dataType:'json',
-                contentType: "application/json;charset=utf-8",
-                data:JSON.stringify(data),
-                beforeSend:function () {
-                    this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
-                },
-                success:function(data){
-                    layer.close(this.layerIndex);
-                    if(data.status !== 200){
-                        layer.msg(data.statusInfo.message);//失败的表情
-                        return;
-                    }else{
-                        layer.msg("登录成功", {
-                            icon: 6,//成功的表情
-                            time: 1000 //1秒关闭（如果不配置，默认是3秒）
-                        }, function(){
-                            cookieUtil.createCookie("token",data.data)
-                            window.location = '/index';
-                        });
-
-                    }
-                },
-                complete: function () {
-                    layer.close(this.layerIndex);
-                }
-            })
-            return false;
-        });
-    });
-</script>
-</body>
-</html>
diff --git a/src/main/resources/templates/pages/user/userInfo.html b/src/main/resources/templates/pages/user/userInfo.html
new file mode 100644
index 00000000..4e4da758
--- /dev/null
+++ b/src/main/resources/templates/pages/user/userInfo.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>后台管理-登陆</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta http-equiv="Access-Control-Allow-Origin" content="*">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="format-detection" content="telephone=no">
+    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
+    <link rel="stylesheet" href="/static/css/public.css">
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+</head>
+<body>
+<div class="layui-container">
+    <div class="admin-login-background">
+        <div class="layui-form login-form">
+            <form class="layui-form layui-form-pane" action="">
+
+                <div style="text-align: center" onclick="showInfo()">
+                    <img th:attr="src=${userInfo.getIcon()}" alt="头像" class="userInfo_icon">
+                </div>
+                <div style="text-align: center;margin-top: 20px">
+                    <span id="number" th:text="${userInfo.getNumber()}" style="font-size: x-large"></span>
+                </div>
+                <div style="text-align: center;margin-top: 20px">
+                    <span id="maindeparmentname" th:text="${userInfo.getMaindeparmentname()}"
+                          style="font-size: x-large"></span>
+                </div>
+                <div style="text-align: center;margin-top: 20px">
+                    <span id="name" th:text="${userInfo.getName()}" style="font-size: x-large"></span>
+                </div>
+
+                <div class="layui-form-item" style="margin-top: 20%">
+                    <button class="layui-btn layui-btn layui-btn-normal layui-btn-fluid" onclick="loginOut()">退出
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script src="/static/lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
+<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
+<script>
+    function loginOut() {
+
+    }
+
+    function showInfo() {
+
+    }
+
+    layui.use(['layer', 'form'], function () {
+        var form = layui.form,
+            $ = layui.jquery,
+            layer = layui.layer;
+
+        loginOut = function () {
+            $.ajax({
+                url: "/loginOut",
+                type: 'get',
+                dataType: 'json',
+                contentType: "application/json;charset=utf-8",
+                beforeSend: function () {
+                    this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                },
+                success: function (data) {
+                    layer.close(this.layerIndex);
+                    layer.msg(data.statusInfo.message, function () {
+                        window.location = '/login';
+                    });
+                }
+            });
+        };
+
+        showInfo = function () {
+            layer.open({
+                type: 2,
+                title: '个人信息',
+                skin: 'layui-layer-rim',
+                maxmin: true,
+                shadeClose: true, //点击遮罩关闭层
+                area: ['100%', '100%'],
+                content: '/account_look',
+                move: '.layui-layer-title',
+                fixed: false,
+                success: function (layero, index) {
+                    var children = layero.children();
+                    var content = $(children[1]);
+                    var iframeChildren = $(content.children());
+                    content.css('height', '100%');
+                    iframeChildren.css('height', '100%');
+                }
+            })
+        }
+
+    });
+</script>
+</body>
+</html>
diff --git a/target/classes/static/css/public.css b/target/classes/static/css/public.css
index ce91bcbb..1b7d493b 100644
--- a/target/classes/static/css/public.css
+++ b/target/classes/static/css/public.css
@@ -227,3 +227,8 @@ body {
     color: #999;
 }
 
+.userInfo_icon{
+    height: 200px;
+    width: 200px;
+    border-radius: 50%;
+}
diff --git a/target/classes/templates/index_mobile.html b/target/classes/templates/index_mobile.html
index 7f8c3029..ddc3a955 100644
--- a/target/classes/templates/index_mobile.html
+++ b/target/classes/templates/index_mobile.html
@@ -146,7 +146,7 @@
                     </a>
                 </div>
                 <div class="layuimini-footer-content-item">
-                    <a href="javascript:;" layuimini-content-href="/welcome" data-title="我的" style="display: inline-block"
+                    <a href="javascript:;" layuimini-content-href="/userInfo" data-title="我的" style="display: inline-block"
                        data-icon="fa fa-window-maximize">
                         <i class="fa fa-user-o fa-lg fa-fw" style=" position: relative; top: -8px; left: 15px;"></i>
                         <span style=" display: inline-block; position: relative; top: 10px;left: -15px; font-size: 14px">我的</span>
diff --git a/target/classes/templates/pages/user/login_back.html b/target/classes/templates/pages/user/login_back.html
deleted file mode 100644
index f3739e4a..00000000
--- a/target/classes/templates/pages/user/login_back.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <title>后台管理-登陆</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="Access-Control-Allow-Origin" content="*">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
-    <link rel="stylesheet"  href="/static/css/public.css">
-    <!--[if lt IE 9]>
-    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
-    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
-    <style>
-        html, body {width: 100%;height: 100%;overflow: hidden}
-        body {background: #1E9FFF;}
-        body:after {content:'';background-repeat:no-repeat;background-size:cover;-webkit-filter:blur(3px);-moz-filter:blur(3px);-o-filter:blur(3px);-ms-filter:blur(3px);filter:blur(3px);position:absolute;top:0;left:0;right:0;bottom:0;z-index:-1;}
-        .layui-container {width: 100%;height: 100%;overflow: hidden}
-        .admin-login-background {width:360px;height:300px;position:absolute;left:50%;top:40%;margin-left:-180px;margin-top:-100px;}
-        .logo-title {text-align:center;letter-spacing:2px;padding:14px 0;}
-        .logo-title h1 {color:#1E9FFF;font-size:25px;font-weight:bold;}
-        .login-form {background-color:#fff;border:1px solid #fff;border-radius:3px;padding:14px 20px;box-shadow:0 0 8px #eeeeee;}
-        .login-form .layui-form-item {position:relative;}
-        .login-form .layui-form-item label {position:absolute;left:1px;top:1px;width:38px;line-height:36px;text-align:center;color:#d2d2d2;}
-        .login-form .layui-form-item input {padding-left:36px;}
-        .captcha {width:60%;display:inline-block;}
-        .captcha-img {display:inline-block;width:34%;float:right;}
-        .captcha-img img {height:34px;border:1px solid #e6e6e6;height:36px;width:100%;}
-    </style>
-</head>
-<body>
-<div class="layui-container">
-    <div class="admin-login-background">
-        <div class="layui-form login-form">
-            <form class="layui-form layui-form-pane" action="">
-                <div class="layui-form-item logo-title">
-                    <h1>仓库管理系统登录</h1>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-icon layui-icon-username" ></label>
-                    <input type="text" name="principal" lay-verify="required|account" placeholder="请输入邮箱" autocomplete="off" class="layui-input" >
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-icon layui-icon-password" ></label>
-                    <input type="password" name="credentials" lay-verify="required|password" placeholder="密码" autocomplete="off" class="layui-input">
-                </div>
-                <!-- 徒有其表的验证码，主要是不想另外弄了 -->
-                <div class="layui-form-item">
-                    <label class="layui-icon layui-icon-vercode" ></label>
-                    <input type="text" name="captcha" value="XSZG" lay-verify="required|captcha" placeholder="图形验证码" autocomplete="off" class="layui-input verification captcha">
-                    <div class="captcha-img">
-                        <img id="captchaPic" src="static/images/captcha.jpg">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <input type="checkbox" name="rememberMe" value="true" lay-skin="primary" title="记住密码">
-                </div>
-                <div class="layui-form-item">
-                    <button class="layui-btn layui-btn layui-btn-normal layui-btn-fluid" lay-submit="" lay-filter="login">登 入</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-<script  src="static/lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
-<script  src="static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script  src="static/lib/jq-module/jquery.particleground.min.js" charset="utf-8"></script>
-<script  src="static/js/cookie.js" charset="utf-8"></script>
-<script>
-    layui.use(['layer','form'], function () {
-        var form = layui.form,
-            layer = layui.layer;
-
-
-        // 登录过期的时候，跳出ifram框架
-        if (top.location != self.location) top.location = self.location;
-
-        // 粒子线条背景
-        $(document).ready(function(){
-            $('.layui-container').particleground({
-                dotColor:'#7ec7fd',
-                lineColor:'#7ec7fd'
-            });
-        });
-
-        // 进行登录操作
-        form.on('submit(login)', function (data) {
-            data = data.field;
-            if (data.principal === '') {
-                layer.msg('用户名不能为空');
-                return false;
-            }
-            if (data.credentials === '') {
-                layer.msg('密码不能为空');
-                return false;
-            }
-            if (data.captcha === '') {
-                layer.msg('验证码不能为空');
-                return false;
-            }
-            data.loginType="email";
-            $.ajax({
-                url:"/login",
-                type:'post',
-                dataType:'json',
-                contentType: "application/json;charset=utf-8",
-                data:JSON.stringify(data),
-                beforeSend:function () {
-                    this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
-                },
-                success:function(data){
-                    layer.close(this.layerIndex);
-                    if(data.status !== 200){
-                        layer.msg(data.statusInfo.message);//失败的表情
-                        return;
-                    }else{
-                        layer.msg("登录成功", {
-                            icon: 6,//成功的表情
-                            time: 1000 //1秒关闭（如果不配置，默认是3秒）
-                        }, function(){
-                            cookieUtil.createCookie("token",data.data)
-                            window.location = '/index';
-                        });
-
-                    }
-                },
-                complete: function () {
-                    layer.close(this.layerIndex);
-                }
-            })
-            return false;
-        });
-    });
-</script>
-</body>
-</html>