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

Merge branch 'pr_2' into 2.0.x

Browse Source 
# Conflicts:
#	continew-admin-common/pom.xml
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java
#	pom.xml
This commit is contained in:
Charles7c
2023-03-30 22:59:43 +08:00
parent 65401d0219 dea160a7b2
commit 0aafcc015c
44 changed files with 122 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java
View File

@@ -19,7 +19,7 @@ package top.charles7c.cnadmin.common.util;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java
View File

@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import lombok.AccessLevel;
import lombok.Data;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java
View File

@@ -18,8 +18,8 @@ package top.charles7c.cnadmin.common.util;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

6
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java
View File

@@ -18,14 +18,14 @@ package top.charles7c.cnadmin.common.util.helper;
import java.time.LocalDateTime;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.extra.servlet.JakartaServletUtil;
import cn.hutool.extra.spring.SpringUtil;
import top.charles7c.cnadmin.common.constant.CacheConsts;
@@ -60,7 +60,7 @@ public class LoginHelper {
// 记录登录信息
HttpServletRequest request = ServletUtils.getRequest();
loginUser.setClientIp(ServletUtil.getClientIP(request));
loginUser.setClientIp(JakartaServletUtil.getClientIP(request));
loginUser.setLocation(IpUtils.getCityInfo(loginUser.getClientIp()));
loginUser.setBrowser(ServletUtils.getBrowser(request));
LogContext logContext = LogContextHolder.get();

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
View File

@@ -83,7 +83,7 @@ public class QueryHelper {
* 查询数据类型
*/
private static <Q, R> void buildQuery(Q query, Field field, QueryWrapper<R> queryWrapper) {
boolean accessible = field.isAccessible();
boolean accessible = field.canAccess(null);
try {
field.setAccessible(true);
// 没有 @Query，直接返回