diff --git a/src/main/java/com/laker/admin/framework/aop/MetricsAspect.java b/src/main/java/com/laker/admin/framework/aop/MetricsAspect.java
index 82a3b9831974e5860f1415c59a64a089f6ba3821..2615a2cfd521a0e092b24614b3de7eb80f1e3410 100644
--- a/src/main/java/com/laker/admin/framework/aop/MetricsAspect.java
+++ b/src/main/java/com/laker/admin/framework/aop/MetricsAspect.java
@@ -3,8 +3,6 @@ package com.laker.admin.framework.aop;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.laker.admin.module.ext.entity.ExtLog;
@@ -83,8 +81,7 @@ public class MetricsAspect {
if (StrUtil.isNotBlank(response) && response.length() <= 500) {
logBean.setResponse(response);
}
- JSON json = JSONUtil.parse(response);
- if (json instanceof JSONObject) {
+ if (JSONUtil.isJsonObj(response)) {
Boolean success = JSONUtil.parseObj(response).getBool("success", true);
logBean.setStatus(success);
}
diff --git a/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java b/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java
index 7d5748abe284b178843512a5e85071073cf83f7e..174d2a497a0207a17343b6f3c5f53e4bfd1e478a 100644
--- a/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java
+++ b/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java
@@ -2,6 +2,7 @@ package com.laker.admin.module.sys.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -169,4 +170,12 @@ public class SysUserController {
return Response.ok(allRole);
}
+
+ @DeleteMapping("/batch/{ids}")
+ @ApiOperation(value = "根据批量删除ids删除")
+ @SaCheckPermission("dict.delete")
+ public Response batchRemove(@PathVariable Long[] ids) {
+ return Response.ok(sysUserService.removeByIds(CollUtil.toList(ids)));
+ }
+
}
\ No newline at end of file
diff --git a/web/admin/component/pear/module/easyAdmin.js b/web/admin/component/pear/module/easyAdmin.js
index ec422ec1e77df4585d2fbd7e47f5b33c6c7872f8..2fb814cb98051b27b780ffcf869ff67373b4ed40 100644
--- a/web/admin/component/pear/module/easyAdmin.js
+++ b/web/admin/component/pear/module/easyAdmin.js
@@ -216,8 +216,7 @@ layui.define(['jquery', 'element', 'form', 'table', 'yaml', 'common'], function
layer.msg(result.msg, {
icon: 2,
time: 1000,
- area: ['100px', '65px'],
- content: "删除失败"
+ area: ['260px', '65px']
});
}
}
@@ -313,7 +312,7 @@ layui.define(['jquery', 'element', 'form', 'table', 'yaml', 'common'], function
} else {
layer.msg(result.msg, {
icon: 2,
- area: ['100px', '65px'],
+ area: ['260px', '65px'],
time: 1000
});
}
diff --git a/web/admin/view/ext/log.html b/web/admin/view/ext/log.html
index 0d70adede64a09374817e86c1eecde5aee4122cf..7815adce056a95a87061498f0f56ba18c24dbd24 100644
--- a/web/admin/view/ext/log.html
+++ b/web/admin/view/ext/log.html
@@ -72,9 +72,7 @@
let easyAdmin = layui.easyAdmin;
let cols = [
- [{
- type: 'checkbox'
- },
+ [
{
title: '用户',
field: 'user.nickName',
@@ -141,7 +139,7 @@
title: '访问状态',
field: 'status',
align: 'center',
- width: 60,
+ width: 80,
templet: '#log-bar'
}
]
diff --git a/web/admin/view/flow/orderList.html b/web/admin/view/flow/orderList.html
index e3795dfdc2ad0eb8d96b11a8fc1917c550f50e23..5d0bd8dce2eb7dd650d03babb6f4c6e76cf065ca 100644
--- a/web/admin/view/flow/orderList.html
+++ b/web/admin/view/flow/orderList.html
@@ -36,22 +36,10 @@
-
-
-
-
-
-
-
-
-
-
@@ -77,9 +65,7 @@
let common = layui.common;
let easyAdmin = layui.easyAdmin;
let cols = [
- [{
- type: 'checkbox'
- },
+ [
{
title: '流程实例编号',
field: 'orderNo',
diff --git a/web/admin/view/system/deptment.html b/web/admin/view/system/deptment.html
index 19496c7f9ace51caa030d36e1826ce248823214b..0f7e88b4e505861dd74faf5d0c9fe70e8be1778f 100644
--- a/web/admin/view/system/deptment.html
+++ b/web/admin/view/system/deptment.html
@@ -160,7 +160,7 @@
if (result.success) {
layer.msg("操作成功", {icon: 1, time: 1000, area: ['100px', '65px']});
} else {
- layer.msg(result.msg, {icon: 2, time: 1000, area: ['100px', '65px']});
+ layer.msg(result.msg, {icon: 2, time: 1000, area: ['260px', '65px']});
}
}
})
diff --git a/web/admin/view/system/power.html b/web/admin/view/system/power.html
index ac90b9eb69c2edb4336bc66a3ff42b9a189ac3b5..26aa1483db56bf42e5509a7bc641ccb15e90d4f3 100644
--- a/web/admin/view/system/power.html
+++ b/web/admin/view/system/power.html
@@ -17,10 +17,6 @@
新增
-