Browse Source

登录日志新增解锁账户功能

RuoYi 3 years ago
parent
commit
c8a108b93a

+ 14 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java

@@ -10,12 +10,14 @@ import org.springframework.web.bind.annotation.PostMapping;
10
 import org.springframework.web.bind.annotation.RequestBody;
10
 import org.springframework.web.bind.annotation.RequestBody;
11
 import org.springframework.web.bind.annotation.RequestMapping;
11
 import org.springframework.web.bind.annotation.RequestMapping;
12
 import org.springframework.web.bind.annotation.RestController;
12
 import org.springframework.web.bind.annotation.RestController;
13
+import com.ruoyi.common.core.constant.CacheConstants;
13
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
14
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
14
 import com.ruoyi.common.core.web.controller.BaseController;
15
 import com.ruoyi.common.core.web.controller.BaseController;
15
 import com.ruoyi.common.core.web.domain.AjaxResult;
16
 import com.ruoyi.common.core.web.domain.AjaxResult;
16
 import com.ruoyi.common.core.web.page.TableDataInfo;
17
 import com.ruoyi.common.core.web.page.TableDataInfo;
17
 import com.ruoyi.common.log.annotation.Log;
18
 import com.ruoyi.common.log.annotation.Log;
18
 import com.ruoyi.common.log.enums.BusinessType;
19
 import com.ruoyi.common.log.enums.BusinessType;
20
+import com.ruoyi.common.redis.service.RedisService;
19
 import com.ruoyi.common.security.annotation.InnerAuth;
21
 import com.ruoyi.common.security.annotation.InnerAuth;
20
 import com.ruoyi.common.security.annotation.RequiresPermissions;
22
 import com.ruoyi.common.security.annotation.RequiresPermissions;
21
 import com.ruoyi.system.api.domain.SysLogininfor;
23
 import com.ruoyi.system.api.domain.SysLogininfor;
@@ -33,6 +35,9 @@ public class SysLogininforController extends BaseController
33
     @Autowired
35
     @Autowired
34
     private ISysLogininforService logininforService;
36
     private ISysLogininforService logininforService;
35
 
37
 
38
+    @Autowired
39
+    private RedisService redisService;
40
+
36
     @RequiresPermissions("system:logininfor:list")
41
     @RequiresPermissions("system:logininfor:list")
37
     @GetMapping("/list")
42
     @GetMapping("/list")
38
     public TableDataInfo list(SysLogininfor logininfor)
43
     public TableDataInfo list(SysLogininfor logininfor)
@@ -69,6 +74,15 @@ public class SysLogininforController extends BaseController
69
         return AjaxResult.success();
74
         return AjaxResult.success();
70
     }
75
     }
71
 
76
 
77
+    @RequiresPermissions("system:logininfor:unlock")
78
+    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
79
+    @GetMapping("/unlock//{userName}")
80
+    public AjaxResult unlock(@PathVariable("userName") String userName)
81
+    {
82
+        redisService.deleteObject(CacheConstants.PWD_ERR_CNT_KEY + userName);
83
+        return success();
84
+    }
85
+
72
     @InnerAuth
86
     @InnerAuth
73
     @PostMapping
87
     @PostMapping
74
     public AjaxResult add(@RequestBody SysLogininfor logininfor)
88
     public AjaxResult add(@RequestBody SysLogininfor logininfor)

+ 7 - 0
ruoyi-ui/src/api/system/logininfor.js

@@ -17,6 +17,13 @@ export function delLogininfor(infoId) {
17
   })
17
   })
18
 }
18
 }
19
 
19
 
20
+// 解锁用户登录状态
21
+export function unlockLogininfor(userName) {
22
+  return request({
23
+    url: '/system/logininfor/unlock/' + userName,
24
+    method: 'get'
25
+  })
26
+}
20
 // 清空登录日志
27
 // 清空登录日志
21
 export function cleanLogininfor() {
28
 export function cleanLogininfor() {
22
   return request({
29
   return request({

+ 27 - 1
ruoyi-ui/src/views/system/logininfor/index.vue

@@ -75,6 +75,17 @@
75
       </el-col>
75
       </el-col>
76
       <el-col :span="1.5">
76
       <el-col :span="1.5">
77
         <el-button
77
         <el-button
78
+          type="primary"
79
+          plain
80
+          icon="el-icon-unlock"
81
+          size="mini"
82
+          :disabled="single"
83
+          @click="handleUnlock"
84
+          v-hasPermi="['system:logininfor:unlock']"
85
+        >解锁</el-button>
86
+      </el-col>
87
+      <el-col :span="1.5">
88
+        <el-button
78
           type="warning"
89
           type="warning"
79
           plain
90
           plain
80
           icon="el-icon-download"
91
           icon="el-icon-download"
@@ -115,7 +126,7 @@
115
 </template>
126
 </template>
116
 
127
 
117
 <script>
128
 <script>
118
-import { list, delLogininfor, cleanLogininfor } from "@/api/system/logininfor";
129
+import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/system/logininfor";
119
 
130
 
120
 export default {
131
 export default {
121
   name: "Logininfor",
132
   name: "Logininfor",
@@ -126,8 +137,12 @@ export default {
126
       loading: true,
137
       loading: true,
127
       // 选中数组
138
       // 选中数组
128
       ids: [],
139
       ids: [],
140
+      // 非单个禁用
141
+      single: true,
129
       // 非多个禁用
142
       // 非多个禁用
130
       multiple: true,
143
       multiple: true,
144
+      // 选择用户名
145
+      selectName: "",
131
       // 显示搜索条件
146
       // 显示搜索条件
132
       showSearch: true,
147
       showSearch: true,
133
       // 总条数
148
       // 总条数
@@ -177,7 +192,9 @@ export default {
177
     /** 多选框选中数据 */
192
     /** 多选框选中数据 */
178
     handleSelectionChange(selection) {
193
     handleSelectionChange(selection) {
179
       this.ids = selection.map(item => item.infoId)
194
       this.ids = selection.map(item => item.infoId)
195
+      this.single = selection.length!=1
180
       this.multiple = !selection.length
196
       this.multiple = !selection.length
197
+      this.selectName = selection.map(item => item.userName);
181
     },
198
     },
182
     /** 排序触发事件 */
199
     /** 排序触发事件 */
183
     handleSortChange(column, prop, order) {
200
     handleSortChange(column, prop, order) {
@@ -204,6 +221,15 @@ export default {
204
         this.$modal.msgSuccess("清空成功");
221
         this.$modal.msgSuccess("清空成功");
205
       }).catch(() => {});
222
       }).catch(() => {});
206
     },
223
     },
224
+    /** 解锁按钮操作 */
225
+    handleUnlock() {
226
+      const username = this.selectName;
227
+      this.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(function() {
228
+        return unlockLogininfor(username);
229
+      }).then(() => {
230
+        this.$modal.msgSuccess("用户" + username + "解锁成功");
231
+      }).catch(() => {});
232
+    },
207
     /** 导出按钮操作 */
233
     /** 导出按钮操作 */
208
     handleExport() {
234
     handleExport() {
209
       this.download('system/logininfor/export', {
235
       this.download('system/logininfor/export', {

+ 18 - 16
sql/ry_20220613.sql

@@ -234,29 +234,30 @@ insert into sys_menu values('1038', '公告删除', '107', '4', '#', '', '', 1,
234
 -- 操作日志按钮
234
 -- 操作日志按钮
235
 insert into sys_menu values('1039', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query',       '#', 'admin', sysdate(), '', null, '');
235
 insert into sys_menu values('1039', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query',       '#', 'admin', sysdate(), '', null, '');
236
 insert into sys_menu values('1040', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove',      '#', 'admin', sysdate(), '', null, '');
236
 insert into sys_menu values('1040', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove',      '#', 'admin', sysdate(), '', null, '');
237
-insert into sys_menu values('1041', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export',      '#', 'admin', sysdate(), '', null, '');
237
+insert into sys_menu values('1041', '日志导出', '500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export',      '#', 'admin', sysdate(), '', null, '');
238
 -- 登录日志按钮
238
 -- 登录日志按钮
239
 insert into sys_menu values('1042', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query',    '#', 'admin', sysdate(), '', null, '');
239
 insert into sys_menu values('1042', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query',    '#', 'admin', sysdate(), '', null, '');
240
 insert into sys_menu values('1043', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove',   '#', 'admin', sysdate(), '', null, '');
240
 insert into sys_menu values('1043', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove',   '#', 'admin', sysdate(), '', null, '');
241
 insert into sys_menu values('1044', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export',   '#', 'admin', sysdate(), '', null, '');
241
 insert into sys_menu values('1044', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export',   '#', 'admin', sysdate(), '', null, '');
242
+insert into sys_menu values('1045', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:unlock',   '#', 'admin', sysdate(), '', null, '');
242
 -- 在线用户按钮
243
 -- 在线用户按钮
243
-insert into sys_menu values('1045', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query',       '#', 'admin', sysdate(), '', null, '');
244
-insert into sys_menu values('1046', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, '');
245
-insert into sys_menu values('1047', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, '');
244
+insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query',       '#', 'admin', sysdate(), '', null, '');
245
+insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, '');
246
+insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, '');
246
 -- 定时任务按钮
247
 -- 定时任务按钮
247
-insert into sys_menu values('1048', '任务查询', '110', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:query',          '#', 'admin', sysdate(), '', null, '');
248
-insert into sys_menu values('1049', '任务新增', '110', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:add',            '#', 'admin', sysdate(), '', null, '');
249
-insert into sys_menu values('1050', '任务修改', '110', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:edit',           '#', 'admin', sysdate(), '', null, '');
250
-insert into sys_menu values('1051', '任务删除', '110', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:remove',         '#', 'admin', sysdate(), '', null, '');
251
-insert into sys_menu values('1052', '状态修改', '110', '5', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus',   '#', 'admin', sysdate(), '', null, '');
252
-insert into sys_menu values('1053', '任务导出', '110', '7', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:export',         '#', 'admin', sysdate(), '', null, '');
248
+insert into sys_menu values('1049', '任务查询', '110', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:query',          '#', 'admin', sysdate(), '', null, '');
249
+insert into sys_menu values('1050', '任务新增', '110', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:add',            '#', 'admin', sysdate(), '', null, '');
250
+insert into sys_menu values('1051', '任务修改', '110', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:edit',           '#', 'admin', sysdate(), '', null, '');
251
+insert into sys_menu values('1052', '任务删除', '110', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:remove',         '#', 'admin', sysdate(), '', null, '');
252
+insert into sys_menu values('1053', '状态修改', '110', '5', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus',   '#', 'admin', sysdate(), '', null, '');
253
+insert into sys_menu values('1054', '任务导出', '110', '6', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:export',         '#', 'admin', sysdate(), '', null, '');
253
 -- 代码生成按钮
254
 -- 代码生成按钮
254
-insert into sys_menu values('1054', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query',             '#', 'admin', sysdate(), '', null, '');
255
-insert into sys_menu values('1055', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit',              '#', 'admin', sysdate(), '', null, '');
256
-insert into sys_menu values('1056', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove',            '#', 'admin', sysdate(), '', null, '');
257
-insert into sys_menu values('1057', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import',            '#', 'admin', sysdate(), '', null, '');
258
-insert into sys_menu values('1058', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 'admin', sysdate(), '', null, '');
259
-insert into sys_menu values('1059', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 'admin', sysdate(), '', null, '');
255
+insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query',             '#', 'admin', sysdate(), '', null, '');
256
+insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit',              '#', 'admin', sysdate(), '', null, '');
257
+insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove',            '#', 'admin', sysdate(), '', null, '');
258
+insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import',            '#', 'admin', sysdate(), '', null, '');
259
+insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 'admin', sysdate(), '', null, '');
260
+insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 'admin', sysdate(), '', null, '');
260
 
261
 
261
 
262
 
262
 -- ----------------------------
263
 -- ----------------------------
@@ -372,6 +373,7 @@ insert into sys_role_menu values ('2', '1056');
372
 insert into sys_role_menu values ('2', '1057');
373
 insert into sys_role_menu values ('2', '1057');
373
 insert into sys_role_menu values ('2', '1058');
374
 insert into sys_role_menu values ('2', '1058');
374
 insert into sys_role_menu values ('2', '1059');
375
 insert into sys_role_menu values ('2', '1059');
376
+insert into sys_role_menu values ('2', '1060');
375
 
377
 
376
 -- ----------------------------
378
 -- ----------------------------
377
 -- 8、角色和部门关联表  角色1-N部门
379
 -- 8、角色和部门关联表  角色1-N部门