修复告警信息
This commit is contained in:
parent
2cdcf68e0e
commit
1bdb6bf1b8
11
das/pom.xml
11
das/pom.xml
@ -65,14 +65,6 @@
|
|||||||
<version>${sa.version}</version>
|
<version>${sa.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- hutool 的依赖配置-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-all</artifactId>
|
|
||||||
<version>${hutool.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.dev33</groupId>
|
<groupId>cn.dev33</groupId>
|
||||||
<artifactId>sa-token-redis-jackson</artifactId>
|
<artifactId>sa-token-redis-jackson</artifactId>
|
||||||
@ -108,7 +100,8 @@
|
|||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
||||||
<version>${mybatis.plus.spring.boot}</version>
|
<version>${mybatis.plus.spring.boot}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--hutool-->
|
|
||||||
|
<!-- hutool 的依赖配置-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.hutool</groupId>
|
<groupId>cn.hutool</groupId>
|
||||||
<artifactId>hutool-core</artifactId>
|
<artifactId>hutool-core</artifactId>
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
package com.das.common.utils;
|
package com.das.common.utils;
|
||||||
|
|
||||||
import cn.hutool.http.HttpStatus;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
import org.springframework.http.HttpRequest;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.net.http.HttpResponse;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -52,7 +54,7 @@ public class PageDataInfo<T> implements Serializable {
|
|||||||
|
|
||||||
public static <T> PageDataInfo<T> build(List<T> list, long total) {
|
public static <T> PageDataInfo<T> build(List<T> list, long total) {
|
||||||
PageDataInfo<T> rspData = new PageDataInfo<>();
|
PageDataInfo<T> rspData = new PageDataInfo<>();
|
||||||
rspData.setCode(HttpStatus.HTTP_OK);
|
rspData.setCode(HttpStatus.OK.value());
|
||||||
rspData.setMsg("查询成功");
|
rspData.setMsg("查询成功");
|
||||||
rspData.setRows(list);
|
rspData.setRows(list);
|
||||||
rspData.setTotal(total);
|
rspData.setTotal(total);
|
||||||
@ -61,7 +63,7 @@ public class PageDataInfo<T> implements Serializable {
|
|||||||
|
|
||||||
public static <T> PageDataInfo<T> build(List<T> list) {
|
public static <T> PageDataInfo<T> build(List<T> list) {
|
||||||
PageDataInfo<T> rspData = new PageDataInfo<>();
|
PageDataInfo<T> rspData = new PageDataInfo<>();
|
||||||
rspData.setCode(HttpStatus.HTTP_OK);
|
rspData.setCode(HttpStatus.OK.value());
|
||||||
rspData.setMsg("查询成功");
|
rspData.setMsg("查询成功");
|
||||||
rspData.setRows(list);
|
rspData.setRows(list);
|
||||||
rspData.setTotal(list.size());
|
rspData.setTotal(list.size());
|
||||||
@ -70,7 +72,7 @@ public class PageDataInfo<T> implements Serializable {
|
|||||||
|
|
||||||
public static <T> PageDataInfo<T> build() {
|
public static <T> PageDataInfo<T> build() {
|
||||||
PageDataInfo<T> rspData = new PageDataInfo<>();
|
PageDataInfo<T> rspData = new PageDataInfo<>();
|
||||||
rspData.setCode(HttpStatus.HTTP_OK);
|
rspData.setCode(HttpStatus.OK.value());
|
||||||
rspData.setMsg("查询成功");
|
rspData.setMsg("查询成功");
|
||||||
return rspData;
|
return rspData;
|
||||||
}
|
}
|
||||||
|
@ -59,12 +59,8 @@ public class LoginController {
|
|||||||
*/
|
*/
|
||||||
@PostMapping("/logout")
|
@PostMapping("/logout")
|
||||||
public R<?> logout(HttpServletRequest request) {
|
public R<?> logout(HttpServletRequest request) {
|
||||||
if (loginService.logout(request)) {
|
loginService.logout(request);
|
||||||
return R.success("退出成功");
|
return R.success("退出成功");
|
||||||
} else {
|
|
||||||
return R.fail("退出失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/captchaImage")
|
@PostMapping("/captchaImage")
|
||||||
|
@ -28,7 +28,7 @@ public interface LoginService {
|
|||||||
* 退出登录
|
* 退出登录
|
||||||
* @return 是否退出成功
|
* @return 是否退出成功
|
||||||
*/
|
*/
|
||||||
boolean logout(HttpServletRequest request);
|
void logout(HttpServletRequest request);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 刷新token
|
* 刷新token
|
||||||
|
@ -93,11 +93,10 @@ public class LoginServiceImpl implements LoginService {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean logout(HttpServletRequest request) {
|
public void logout(HttpServletRequest request) {
|
||||||
String token = request.getHeader("token");
|
String token = request.getHeader("token");
|
||||||
adminRedisTemplate.del(token);
|
adminRedisTemplate.del(token);
|
||||||
StpUtil.logoutByTokenValue(token);
|
StpUtil.logoutByTokenValue(token);
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user