From a8681f6598e064579ce6b3ab16a152258839e211 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 09 三月 2022 15:44:37 +0800
Subject: [PATCH] 普通用户登录fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 31 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 4f40bc7..e6b43bb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -1,72 +1,135 @@
package com.sandu.ximon.admin.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.enums.AdminStatusStatus;
+import com.sandu.common.enums.ResponseStatusEnums;
+import com.sandu.common.object.BaseConditionVO;
+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.context.CustomerInspectContextHolder;
+import com.sandu.ximon.admin.param.AddClientPrarm;
+import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientService;
+import com.sandu.ximon.admin.service.RoleService;
+import com.sandu.ximon.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import jodd.cli.Cli;
import lombok.AllArgsConstructor;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 瀹㈡埛妯″潡
+ */
@RestController
@AllArgsConstructor
@RequestMapping("v1/client")
public class ClientController {
+ private final SecurityProperties properties;
private final ClientService clientService;
+ private final PasswordEncoder passwordEncoder;
+ private final RoleService roleService;
+ private final TokenProvider tokenProvider;
- @GetMapping("/add")
- public ResponseVO<Object> addClient(@RequestBody ClientPrarm clientPrarm){
- boolean b = clientService.addClient(clientPrarm);
- if(b){
+ @PostMapping("/add")
+ public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
+ boolean b = clientService.addClient(addClientPrarm);
+ if (b) {
return ResponseUtil.success("娣诲姞鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("娣诲姞澶辫触");
}
}
- @GetMapping ("/update/{id}")
- public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
- boolean b = clientService.updateClient(id,clientPrarm);
- if(b){
+ @PostMapping("/update/{id}")
+ public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated ClientPrarm clientPrarm) {
+ boolean b = clientService.updateClient(id, clientPrarm);
+ if (b) {
return ResponseUtil.success("鏇存柊鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鏇存柊澶辫触");
}
}
- @GetMapping("/delete/{id}")
- public ResponseVO<Object> deleteClient(@PathVariable Long id){
+ @PostMapping("/delete/{id}")
+ public ResponseVO<Object> deleteClient(@PathVariable Long id) {
boolean b = clientService.deleteClient(id);
- if(b){
+ if (b) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鍒犻櫎澶辫触");
}
}
+ @GetMapping("/list")
+ public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
+ if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
+ }
+ if (null != keyword) {
+ wrapper.like(Client::getClientName, keyword)
+ .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
+ .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
+ }
+ return ResponseUtil.successPage(clientService.list(wrapper));
+ }
- @PostMapping("/list")
- public ResponseVO<Object> listClient(){
- // Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 涓虹鐞嗗憳
- /* if(administratorIdentity==0){//鍒ゆ柇 濡傛灉鏄鐞嗗憳 灏卞垽鏂笅CustomerInspectContextHolder.getCustomerId() 鏈夋病鏈夊��
- // Long customerId = CustomerInspectContextHolder.getCustomerId();
- if(customerId!=null){
- return ResponseUtil.success(clientService.list());
- }
- return ResponseUtil.success(clientService.list());
- }else {
-
- }*/
- if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
- // }else if("0".equals(SecurityUtils.getAdministratorIdentity())){
- }else {
- return ResponseUtil.success(clientService.list());
+ @AnonymousAccess
+ @PostMapping(value = "/login")
+ public ResponseVO<Object> longin(@RequestBody @Validated AdminLoginParam loginParam) {
+ Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, loginParam.getUsername()).last("limit 1"));
+ if (client == null) {
+ return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
+ }
+ if (!passwordEncoder.matches(loginParam.getPassword(), client.getPassword())) {
+ return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
+ Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId());
+
+ LoginUserInfo loginUserInfo = new LoginUserInfo();
+ loginUserInfo.setUserId(client.getId());
+ loginUserInfo.setAccount(client.getClientName());
+ loginUserInfo.setIp(IpUtil.getRealIp());
+ loginUserInfo.setAdministratorType(AdministratorEnums.NORMAL.getCode());
+ loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
+
+ // 鐢熸垚浠ょ墝
+ String token = tokenProvider.createToken(loginUserInfo);
+
+ // 鏇存柊鏈�鍚庣櫥褰曟椂闂�
+ Client update = new Client();
+ update.setId(client.getId());
+ update.setLoginTime(LocalDateTime.now());
+ clientService.updateById(update);
+
+ // 杩斿洖 token 涓� 鐢ㄦ埛淇℃伅
+ Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
+ put("token", properties.getTokenStartWith() + token);
+ put("user", client);
+ }};
+ return ResponseUtil.success(authInfo);
}
}
--
Gitblit v1.9.3