From a1c6bf2069c1b0cb2f9174c1bf733e4bf0a276a9 Mon Sep 17 00:00:00 2001
From: laker <935009066@qq.com>
Date: Wed, 1 Sep 2021 14:45:13 +0800
Subject: [PATCH] =?UTF-8?q?(=E6=96=B0=E5=A2=9E)[=E6=95=B4=E4=BD=93](?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8Estomp=E6=8A=80=E6=9C=AF=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8A=E4=B8=8B=E7=BA=BF=E9=80=9A=E7=9F=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/sys/controller/SysDeptController.java      |  8 ++++++--
 .../admin/module/sys/controller/WebLogController.java |  6 ++++++
 web/admin/view/system/user.html                       |  5 +++--
 web/admin/view/system/user/add.html                   |  5 +++--
 web/admin/view/system/user/edit.html                  | 11 +++++------
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/laker/admin/module/sys/controller/SysDeptController.java b/src/main/java/com/laker/admin/module/sys/controller/SysDeptController.java
index bfd2ed3..f2b7d4a 100644
--- a/src/main/java/com/laker/admin/module/sys/controller/SysDeptController.java
+++ b/src/main/java/com/laker/admin/module/sys/controller/SysDeptController.java
@@ -66,13 +66,17 @@ public class SysDeptController {
 
     @GetMapping("/data")
     public ResultTable data(SysDept param) {
-        List<SysDept> data = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getStatus, true));
+        List<SysDept> data = sysDeptService.list(Wrappers.<SysDept>lambdaQuery()
+                .eq(SysDept::getStatus, true)
+                .orderByAsc(SysDept::getSort));
         return ResultTable.dataTable(data);
     }
 
     @GetMapping("/tree")
     public ResultTree tree(SysDept param) {
-        List<SysDept> data = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getStatus, true));
+        List<SysDept> data = sysDeptService.list(Wrappers.<SysDept>lambdaQuery()
+                .eq(SysDept::getStatus, true)
+                .orderByAsc(SysDept::getSort));
         return ResultTree.data(data);
     }
 
diff --git a/src/main/java/com/laker/admin/module/sys/controller/WebLogController.java b/src/main/java/com/laker/admin/module/sys/controller/WebLogController.java
index 17527b3..7ed1e88 100644
--- a/src/main/java/com/laker/admin/module/sys/controller/WebLogController.java
+++ b/src/main/java/com/laker/admin/module/sys/controller/WebLogController.java
@@ -3,6 +3,7 @@ package com.laker.admin.module.sys.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.laker.admin.config.LakerConfig;
+import com.laker.admin.framework.exception.BusinessException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.logging.LoggerGroup;
@@ -39,7 +40,12 @@ public class WebLogController {
 
     @GetMapping(value = "/file", produces = "text/plain; charset=UTF-8")
     @ResponseBody
+    @SaCheckPermission("weblog.list")
     public Resource logFile(@RequestParam(required = false) String filePath) {
+        if (StrUtil.isNotBlank(filePath)) {
+            throw new BusinessException("演示环境，禁止修改模式文件路径");
+        }
+
         String lookFilePath = lakerConfig.getLogFilePath();
         if (StrUtil.isNotBlank(filePath)) {
             lookFilePath = filePath;
diff --git a/web/admin/view/system/user.html b/web/admin/view/system/user.html
index 271cc12..54a97e3 100644
--- a/web/admin/view/system/user.html
+++ b/web/admin/view/system/user.html
@@ -155,11 +155,12 @@
             dtree.renderSelect({
                 elem: "#selectParent",
                 data: data.data,
+                selectTips: "请选择部门",
+                selectCardHeight: "150",
                 selectInputName: {nodeId: "deptId", context: "deptName"},
                 // skin: "layui",
                 dataFormat: "list",
-                response: {treeId: "deptId", parentId: "pid", title: "deptName"},
-                selectInitVal: "1"
+                response: {treeId: "deptId", parentId: "pid", title: "deptName"}
             });
         })
 
diff --git a/web/admin/view/system/user/add.html b/web/admin/view/system/user/add.html
index 62d2a0c..0774afa 100644
--- a/web/admin/view/system/user/add.html
+++ b/web/admin/view/system/user/add.html
@@ -36,7 +36,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">密码</label>
                     <div class="layui-input-block">
-                        <input type="text" name="password" lay-verify="title|required" autocomplete="off"
+                        <input type="password" name="password" lay-verify="required" autocomplete="off"
                                placeholder="请输入标题"
                                class="layui-input">
                     </div>
@@ -125,6 +125,7 @@
             dtree.renderSelect({
                 elem: "#selectParent",
                 data: treeData.data,
+                selectCardHeight: "150",
                 selectInputName: {nodeId: "deptId", context: "deptName"},
                 // skin: "layui",
                 dataFormat: "list",
@@ -162,7 +163,7 @@
                             });
                     } else {
                         layer.msg(result.msg,
-                            {icon: 2, time: 1000, area: ['100px', '80px']}
+                            {icon: 2, time: 1000, area: ['260px', '80px']}
                         );
                     }
                 }
diff --git a/web/admin/view/system/user/edit.html b/web/admin/view/system/user/edit.html
index a0700db..6d07ec8 100644
--- a/web/admin/view/system/user/edit.html
+++ b/web/admin/view/system/user/edit.html
@@ -13,7 +13,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">账号</label>
                     <div class="layui-input-block">
-                        <input type="text" name="userName" value="854085467" lay-verify="title" autocomplete="off"
+                        <input type="text" name="userName" lay-verify="title" autocomplete="off"
                                placeholder="请输入标题" class="layui-input">
                     </div>
                 </div>
@@ -27,14 +27,14 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">邮箱</label>
                     <div class="layui-input-block">
-                        <input type="text" name="email" value="854085467@qq.com" lay-verify="title" autocomplete="off"
+                        <input type="text" name="email" lay-verify="title" autocomplete="off"
                                placeholder="请输入标题" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">电话</label>
                     <div class="layui-input-block">
-                        <input type="text" name="phone" value="15555555555" lay-verify="title" autocomplete="off"
+                        <input type="text" name="phone" lay-verify="title" autocomplete="off"
                                placeholder="请输入标题" class="layui-input">
                     </div>
                 </div>
@@ -54,7 +54,6 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">角色</label>
                     <div id="view11" class="layui-input-block">
-
                     </div>
                 </div>
             </div>
@@ -85,10 +84,9 @@
 </script>
 
 <script>
-    layui.use(['form', 'jquery', 'dtree', 'easyAdmin', 'popup'], function () {
+    layui.use(['form', 'jquery', 'dtree', 'easyAdmin'], function () {
         let form = layui.form;
         let $ = layui.jquery;
-        var popup = layui.popup;
         let dtree = layui.dtree;
         let easyAdmin = layui.easyAdmin;
         var id;
@@ -137,6 +135,7 @@
                         dtree.renderSelect({
                             elem: "#selectParent",
                             data: treeData.data,
+                            selectCardHeight: "150",
                             method: 'get',
                             selectInputName: {nodeId: "deptId", context: "deptName"},
                             // skin: "layui",
-- 
GitLab