ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-26 06:57:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复合并冲突后的若干错误

Browse Source 
1.完善 @Serial
2.完善 javax => jakarta
3.修复 canAccess() 使用错误
4.兼容 JustAuth Spring Boot Starter
5.CI 脚本更新 JDK 8 => 17
This commit is contained in:
Charles7c
2023-11-05 10:41:26 +08:00
parent 51e1cd9307
commit 8dbec9d1a3
63 changed files with 144 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java
View File

@@ -247,7 +247,7 @@ public class LogInterceptor implements HandlerInterceptor {
}
logDO.setClientIp(JakartaServletUtil.getClientIP(request));
logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp()));
logDO.setBrowser(JakartaServletUtil.getBrowser(request));
logDO.setBrowser(ServletUtils.getBrowser(request));
}
/**

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java
View File

@@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "仪表盘-访问趋势信息")
public class DashboardAccessTrendResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java
View File

@@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "仪表盘-访客地域分布信息")
public class DashboardGeoDistributionResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java
View File

@@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -35,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
@Schema(description = "仪表盘-热门模块信息")
public class DashboardPopularModuleResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java
View File

@@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -35,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
@Schema(description = "仪表盘-总计信息")
public class DashboardTotalResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**