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 | 201 +++++++++++++++++++++++++++----------------------
1 files changed, 110 insertions(+), 91 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 1f23eab..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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
+import cn.hutool.extra.servlet.ServletUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
@@ -12,24 +13,24 @@
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
-import com.sandu.common.redis.UserModel;
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;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.AdminLoginParam;
-import com.sandu.ximon.admin.param.AdminParam;
-import com.sandu.ximon.admin.param.PwdParam;
-import com.sandu.ximon.admin.param.ReceiveParam;
+import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
+import eu.bitwalker.useragentutils.Browser;
+import eu.bitwalker.useragentutils.OperatingSystem;
+import eu.bitwalker.useragentutils.UserAgent;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -38,8 +39,12 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -64,14 +69,17 @@
private PermissionConfig permissionConfig;
private final RedisService redisService;
- @Log("鍚庡彴鐢ㄦ埛鐧诲綍")
- @AnonymousAccess
- @PostMapping(value = "/login")
- public ResponseVO<Object> login(@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());
}
+ String s = RedisUtils.getBean().get(loginParam.getKey());
+ if (!loginParam.getVlue().equals(s)) {
+ log.error(loginParam.getVlue() + "楠岃瘉鐮�");
+ return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
+ }
+ RedisUtils.getBean().delete(loginParam.getKey());
if (!passwordEncoder.matches(loginParam.getPassword(), admin.getPassword())) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
@@ -111,8 +119,27 @@
// 杩斿洖 token 涓� 鐢ㄦ埛淇℃伅
Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
put("token", properties.getTokenStartWith() + token);
- put("user", admin);
+ put("admin", admin);
+ put("client", null);
}};
+
+
+ /**
+ * 鐧诲綍淇℃伅鏃ュ織璁板綍寮�濮�
+ */
+ UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
+ Browser browser = userAgent.getBrowser();
+ OperatingSystem os = userAgent.getOperatingSystem();
+ String content = "鐢ㄦ埛ID锛�" + admin.getId()
+ + "锛岀敤鎴峰悕锛�" + admin.getUsername()
+ + "锛岀敤鎴风被鍨嬶細绠＄悊鍛�"
+ + "锛岀櫥褰旾P鍦板潃锛�" + ServletUtil.getClientIP(request)
+ + "锛屾搷浣滅郴缁燂細" + os
+ + "锛屾祻瑙堝櫒锛�" + browser;
+ StoreOperationRecordsUtils.storeOperationLoginData(admin.getId(), admin.getUsername(), "绠＄悊鍛樼櫥褰�", content);
+ /**
+ * 鐧诲綍淇℃伅鏃ュ織璁板綍缁撴潫
+ */
return ResponseUtil.success(authInfo);
}
@@ -160,10 +187,8 @@
@GetMapping(value = "/logout")
public ResponseVO<Object> LogOut() {
-// redisService.set(UserModel.USER_INFO.key(SecurityUtils.getUserId().toString() + SecurityUtils.getUserDetails().getAdministratorType()), null);
-// redisService.set(UserModel.USER_TOKEN.key(UserModel.USER_TOKEN.key(SecurityUtils.getUserDetails().getToken())), null);
-
-
+ String content = "鐢ㄦ埛鍚嶏細" + SecurityUtils.getUsername();
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄧ鐞嗗憳閫�鍑虹櫥褰�", content);
String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
redisService.set(key, null);
return ResponseUtil.success("閫�鍑虹櫥褰曟垚鍔�");
@@ -181,41 +206,22 @@
@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));
-
-// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-// LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
-// if (keyword != null) {
-// wrapper.like(Admin::getNickName, keyword)
-// .or(adminLambdaQueryWrapper -> {
-// adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
-// });
-// }
-// List<Admin> list = adminService.list(wrapper);
-//
-// List<AdminDto> adminDtoList = new ArrayList<>();
-// for (Admin demo : list) {
-// AdminDto adminDto = new AdminDto();
-// BeanUtil.copyProperties(demo, adminDto);
-// AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
-// .eq(AdminRoleRelation::getAdminId, demo.getId()));
-//
-// if (one != null) {
-// adminDto.setRoleId(one.getRoleId());
-// }
-// adminDtoList.add(adminDto);
-//
-// }
-// return ResponseUtil.successPage(adminDtoList);
+ return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword, order, seq));
}
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@PostMapping("/register")
public ResponseVO<Object> register(@Validated @RequestBody AdminParam param) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = adminService.register(param);
if (result) {
return ResponseUtil.success("娉ㄥ唽鐢ㄦ埛鎴愬姛");
@@ -224,7 +230,6 @@
}
}
-// @PreAuthorize("@el.check('admin:edit')")
/**
* 淇敼绠＄悊鍛樹俊鎭�
@@ -232,6 +237,9 @@
@Log("鍚庡彴鐢ㄦ埛淇敼淇℃伅")
@PostMapping("/update/{adminId}")
public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_INFO_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = adminService.updateAdmin(adminId, param);
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
@@ -243,10 +251,16 @@
/**
* 淇敼鎴戠殑瀵嗙爜
*/
- @Log("鍚庡彴鐢ㄦ埛淇敼瀵嗙爜")
- @PutMapping("/updateMyPassword")
+ @Log("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
+ @PostMapping("/updateMyPassword")
public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
- boolean result = adminService.updateMyPassword(param);
+ boolean result;
+ if (SecurityUtils.getClientId() == null) {
+ result = adminService.updateMyPassword(param);
+ } else {
+ result = clientService.resetPassword(param);
+ }
+
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
} else {
@@ -254,24 +268,35 @@
}
}
-// @PutMapping("/updateStatus/{id}")
-// public ResponseVO<Object> updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
-// checkLevel(id);
-// Admin update = new Admin();
-// update.setId(id);
-// update.setStatus(status);
-// adminService.updateById(update);
-// return ResponseUtil.success(null);
-// }
+ /**
+ * 淇敼绠＄悊鍛樼殑瀵嗙爜
+ */
+ @Log("淇敼绠＄悊鍛樼殑瀵嗙爜")
+ @PostMapping("/updateAdminPassword")
+ public ResponseVO<Object> updateAdminPassword(@Validated @RequestBody UserPwsParm param) {
+ if (!SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鏃犳硶淇敼瀵嗙爜锛�");
+ }
- @Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
- @PostMapping("/del/{adminId}")
- public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
- boolean result = adminService.deleteAdmin(adminId);
+ boolean result = adminService.updateAdminPassword(param);
+
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
} else {
return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
+
+ @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("鍒犻櫎绠＄悊鍛樻垚鍔燂紒");
+ } else {
+ return ResponseUtil.fail("鍒犻櫎绠＄悊鍛樺け璐ワ紒");
}
}
@@ -297,37 +322,31 @@
}
}
-// /**
-// * 缁欑鐞嗗憳鍒嗛厤瑙掕壊
-// *
-// * @return
-// */
-// @PostMapping("/updateAdminRole")
-// @PreAuthorize("@el.check('admin:edit')")
-// public ResponseVO<Object> updateAdminRole(@RequestParam("adminId") Long adminId,
-// @RequestParam("roleIds") List<Long> roleIds) {
-// checkLevel(adminId);
-// adminsRolesService.updateAdminRole(adminId, roleIds);
-// return ResponseUtil.success("");
-// }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏉冮檺
+ *
+ * @return
+ */
+ @GetMapping("/getUserPermissionList")
+ public ResponseVO<Object> getUserPermissionList() {
+ List<MenuNode> userPermissionList;
+ if (SecurityUtils.getClientId() == null) {
+ userPermissionList = adminService.getUserPermissionList();
+ } else {
+ userPermissionList = clientService.getUserPermissionList();
+ }
+
+ return ResponseUtil.success(userPermissionList);
+ }
-// /**
-// * 缂栬緫鎴戠殑淇℃伅
-// *
-// * @param resources
-// * @return
-// */
-// @PutMapping("/editUserInfo")
-// public ResponseVO<Object> editUserInfo(@RequestBody AdminParam resources) {
-// Long userId = SecurityUtils.getUserId();
-// Admin admin = new Admin();
-// admin.setId(userId);
-// admin.setMobile(resources.getMobile());
-// admin.setEmail(resources.getEmail());
-// admin.setNickName(resources.getNickName());
-// adminService.updateById(admin);
-// return ResponseUtil.success(null);
-// }
-
+ @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