From f214709cf1d896e7c9743f206b7a708f020e5322 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 17:54:03 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 754a7ce..046456f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -14,7 +14,6 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
import com.sandu.common.security.LoginUserInfo;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.security.config.SecurityProperties;
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
@@ -70,10 +69,7 @@
private PermissionConfig permissionConfig;
private final RedisService redisService;
- @Log("鍚庡彴鐢ㄦ埛鐧诲綍")
- @AnonymousAccess
- @PostMapping(value = "/login")
- public ResponseVO<Object> login(HttpServletRequest request, @RequestBody AdminLoginParam loginParam) {
+ public ResponseVO<Object> login(HttpServletRequest request, AdminLoginParam loginParam) {
Admin admin = adminService.getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getUsername, loginParam.getUsername()).last("limit 1"));
if (admin == null) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
@@ -123,7 +119,8 @@
// 杩斿洖 token 涓� 鐢ㄦ埛淇℃伅
Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
put("token", properties.getTokenStartWith() + token);
- put("user", admin);
+ put("admin", admin);
+ put("client", null);
}};
@@ -191,7 +188,7 @@
@GetMapping(value = "/logout")
public ResponseVO<Object> LogOut() {
String content = "鐢ㄦ埛鍚嶏細" + SecurityUtils.getUsername();
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛閫�鍑虹櫥褰�", content);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄧ鐞嗗憳閫�鍑虹櫥褰�", content);
String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
redisService.set(key, null);
return ResponseUtil.success("閫�鍑虹櫥褰曟垚鍔�");
@@ -209,11 +206,14 @@
@Log("鍚庡彴鐢ㄦ埛鍒楄〃")
@GetMapping(value = "/list")
- public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
+ return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword, order, seq));
}
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@@ -287,17 +287,16 @@
}
}
- @Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
- @PostMapping("/del/{adminId}")
+ @GetMapping("/del/{adminId}")
public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
if (!permissionConfig.check(MenuEnum.ADMIN_DELETE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
boolean result = adminService.deleteAdmin(adminId);
if (result) {
- return ResponseUtil.success("淇敼鎴愬姛");
+ return ResponseUtil.success("鍒犻櫎绠＄悊鍛樻垚鍔燂紒");
} else {
- return ResponseUtil.fail("淇敼澶辫触");
+ return ResponseUtil.fail("鍒犻櫎绠＄悊鍛樺け璐ワ紒");
}
}
@@ -340,4 +339,14 @@
return ResponseUtil.success(userPermissionList);
}
+
+
+ @GetMapping("/creatUserKey")
+ public ResponseVO<Object> creatUserKey(@RequestParam(required = false, value = "userId") Long userId,
+ @RequestParam(required = false, value = "requstType") Integer requstType) {
+ if (!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鏃犳硶鎿嶄綔锛�");
+ }
+ return ResponseUtil.success(adminService.creatUserKey(userId, requstType));
+ }
}
--
Gitblit v1.9.3