odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(util): 重构工具类

Browse Source
This commit is contained in:
odboy
2026-01-09 11:09:08 +08:00
parent 01761ebf91
commit 00c3fddbf1
18 changed files with 154 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
+1 -1
View File
@@ -165,7 +165,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
pageSize = pageSize <= 0 ? 10 : pageSize; pageSize = pageSize <= 0 ? 10 : pageSize;
IPage<E> pageInfo = wrapper.page(new Page<>(pageNumber, pageSize)); IPage<E> pageInfo = wrapper.page(new Page<>(pageNumber, pageSize));
if (CollUtil.isEmpty(pageInfo.getRecords())) { if (CollUtil.isEmpty(pageInfo.getRecords())) {
return KitPageUtil.emptyListData(); return KitPageUtil.emptyData();
} }
return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal()); return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
} }
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
+3 -3
View File
@@ -76,12 +76,12 @@ public final class KitBigDecimalUtil {
* *
* @param a 乘数 * @param a 乘数
* @param b 乘数 * @param b 乘数
* @return 两个乘数的积, 保留两位小数 * @return 两个乘数的积, 保留6位小数
*/ */
public static BigDecimal multiply(Object a, Object b) { public static BigDecimal multiply(Object a, Object b) {
BigDecimal bdA = toBigDecimal(a); BigDecimal bdA = toBigDecimal(a);
BigDecimal bdB = toBigDecimal(b); BigDecimal bdB = toBigDecimal(b);
return bdA.multiply(bdB).setScale(2, RoundingMode.HALF_UP); return bdA.multiply(bdB).setScale(6, RoundingMode.HALF_UP);
} }
/** /**
@@ -94,7 +94,7 @@ public final class KitBigDecimalUtil {
public static BigDecimal divide(Object a, Object b) { public static BigDecimal divide(Object a, Object b) {
BigDecimal bdA = toBigDecimal(a); BigDecimal bdA = toBigDecimal(a);
BigDecimal bdB = toBigDecimal(b); BigDecimal bdB = toBigDecimal(b);
return bdA.divide(bdB, 2, RoundingMode.HALF_UP); return bdA.divide(bdB, 6, RoundingMode.HALF_UP);
} }
/** /**
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
+4 -4
View File
@@ -30,7 +30,7 @@ import lombok.experimental.UtilityClass;
public class KitDateUtil { public class KitDateUtil {
/** /**
* 获取当前时间毫秒数 * 获取当前时间毫秒数 yyyyMMddHHmmssSSS
* *
* @return / * @return /
*/ */
@@ -39,7 +39,7 @@ public class KitDateUtil {
} }
/** /**
* 获取当前时间,但不包括毫秒数 * 获取当前时间,但不包括毫秒数 yyyyMMddHHmmss
* *
* @return / * @return /
*/ */
@@ -48,7 +48,7 @@ public class KitDateUtil {
} }
/** /**
* 获取当前时间,但不包括毫秒数 * 获取当前时间,但不包括毫秒数 yyyyMMdd
* *
* @return / * @return /
*/ */
@@ -61,7 +61,7 @@ public class KitDateUtil {
* *
* @param startTime 开始时间 * @param startTime 开始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @return 格式化后的时间，X天X时X分X秒X毫秒 * @return 格式化后的时间，X天X时X分X秒
*/ */
public static String formatMillsDuration(Date startTime, Date endTime) { public static String formatMillsDuration(Date startTime, Date endTime) {
if (startTime == null || endTime == null) { if (startTime == null || endTime == null) {
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
+1
View File
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
* @author odboy * @author odboy
* @date 2025-04-05 * @date 2025-04-05
*/ */
@Deprecated
public final class KitDistributedIdUtil { public final class KitDistributedIdUtil {
/** /**
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
+8 -7
View File
@@ -20,6 +20,7 @@ import static cn.odboy.constant.SystemConst.SYMBOL_AT;
import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL; import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL;
import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT; import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.BigExcelWriter;
@@ -27,6 +28,9 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.odboy.constant.FileTypeEnum; import cn.odboy.constant.FileTypeEnum;
import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemConst;
import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.exception.BadRequestException;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
@@ -41,9 +45,6 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.util.IOUtils; import org.apache.poi.util.IOUtils;
@@ -55,7 +56,7 @@ import org.springframework.web.multipart.MultipartFile;
*/ */
@Slf4j @Slf4j
@UtilityClass @UtilityClass
public final class KitFileUtil extends cn.hutool.core.io.FileUtil { public final class KitFileUtil {
/** /**
* 系统临时目录 * 系统临时目录
@@ -92,7 +93,7 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
// 获取文件名 // 获取文件名
String fileName = multipartFile.getOriginalFilename(); String fileName = multipartFile.getOriginalFilename();
// 获取文件后缀 // 获取文件后缀
String prefix = "." + getSuffix(fileName); String prefix = "." + FileUtil.getSuffix(fileName);
File file = null; File file = null;
try { try {
// 用uuid作为文件名, 防止生成的临时文件重复 // 用uuid作为文件名, 防止生成的临时文件重复
@@ -158,8 +159,8 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
Date date = new Date(); Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssS"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssS");
// 过滤非法文件名 // 过滤非法文件名
String name = getPrefix(verifyFilename(file.getOriginalFilename())); String name = FileUtil.getPrefix(verifyFilename(file.getOriginalFilename()));
String suffix = getSuffix(file.getOriginalFilename()); String suffix = FileUtil.getSuffix(file.getOriginalFilename());
String nowStr = "-" + format.format(date); String nowStr = "-" + format.format(date);
try { try {
String fileName = name + nowStr + "." + suffix; String fileName = name + nowStr + "." + suffix;
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
-14
View File
@@ -16,10 +16,7 @@
package cn.odboy.util; package cn.odboy.util;
import cn.odboy.base.KitPageResult; import cn.odboy.base.KitPageResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
@@ -62,13 +59,6 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
return new KitPageResult<>(list, list.size()); return new KitPageResult<>(list, list.size());
} }
/**
* 返回空数据
*/
public static <T> KitPageResult<T> emptyListData() {
return new KitPageResult<>(new ArrayList<>(), 0);
}
/** /**
* 返回空数据 * 返回空数据
*/ */
@@ -82,8 +72,4 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
public static <T> KitPageResult<T> toPage(List<T> list, long totalElements) { public static <T> KitPageResult<T> toPage(List<T> list, long totalElements) {
return new KitPageResult<>(list, totalElements); return new KitPageResult<>(list, totalElements);
} }
public static <T> Page<T> getCount(BaseMapper<T> baseMapper) {
return new Page<>(1, baseMapper.selectCount(null));
}
} }
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class OperationLogAspect {
} }
} }
if (StrUtil.isBlank(bizName)) { if (StrUtil.isBlank(bizName)) {
bizName = "默认业务"; bizName = "Default";
} }
String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
Object[] args = joinPoint.getArgs(); Object[] args = joinPoint.getArgs();
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/SystemOperationLogAspect.java
-122
View File
@@ -1,122 +0,0 @@
/*
* Copyright 2021-2025 Odboy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.odboy.system.framework.operalog;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.KitRequestHolder;
import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.util.KitBrowserUtil;
import cn.odboy.util.KitIPUtil;
import com.alibaba.fastjson2.JSON;
import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Method;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 捕捉操作日志
*
* @author odboy
* @date 2025-05-12
*/
@Slf4j
@Aspect
@Component
public class SystemOperationLogAspect {
@Autowired
private SystemOperationLogMapper systemOperationLogMapper;
@Around("@annotation(operationLog)")
public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable {
return handleLog(joinPoint, operationLog);
}
private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable {
TimeInterval timeInterval = new TimeInterval();
try {
Object result = joinPoint.proceed();
SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
ThreadUtil.execAsync(() -> {
try {
systemOperationLogMapper.insert(record);
} catch (Exception e) {
// log.error("保存审计日志失败", e);
// 忽略
}
});
return result;
} catch (Throwable exception) {
SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
ThreadUtil.execAsync(() -> {
try {
systemOperationLogMapper.insert(record);
} catch (Exception e) {
// log.error("保存审计日志失败", e);
// 忽略
}
});
throw exception;
}
}
private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation,
TimeInterval timeInterval) {
long executeTime = timeInterval.intervalMs();
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
String bizName = annotation.bizName();
if (StrUtil.isBlank(bizName)) {
Method method = signature.getMethod();
ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
if (apiOperation != null) {
bizName = apiOperation.value();
}
}
if (StrUtil.isBlank(bizName)) {
bizName = "默认业务";
}
String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
Object[] args = joinPoint.getArgs();
String params = JSON.toJSONString(args);
HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
String requestIp = KitBrowserUtil.getIp(request);
String browserInfo = KitBrowserUtil.getVersion(request);
String address = KitIPUtil.getCityInfo(requestIp);
String username = KitSecurityHelper.getCurrentUsername();
SystemOperationLogTb record = new SystemOperationLogTb();
record.setBizName(bizName);
record.setMethod(method);
record.setParams(params);
record.setRequestIp(requestIp);
record.setExecuteTime(executeTime);
record.setUsername(username);
record.setAddress(address);
record.setBrowserInfo(browserInfo);
return record;
}
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java → cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/captcha") @RequestMapping("/captcha")
@Api(tags = "系统：验证码管理") @Api(tags = "系统：验证码管理")
public class SystemCaptchaOpenController { public class OpenCaptchaController {
@Autowired @Autowired
private SystemCaptchaService systemCaptchaService; private SystemCaptchaService systemCaptchaService;
cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
+1 -1
View File
@@ -165,7 +165,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
pageSize = pageSize <= 0 ? 10 : pageSize; pageSize = pageSize <= 0 ? 10 : pageSize;
IPage<E> pageInfo = wrapper.page(new Page<>(pageNumber, pageSize)); IPage<E> pageInfo = wrapper.page(new Page<>(pageNumber, pageSize));
if (CollUtil.isEmpty(pageInfo.getRecords())) { if (CollUtil.isEmpty(pageInfo.getRecords())) {
return KitPageUtil.emptyListData(); return KitPageUtil.emptyData();
} }
return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal()); return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
} }
cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
+3 -3
View File
@@ -76,12 +76,12 @@ public final class KitBigDecimalUtil {
* *
* @param a 乘数 * @param a 乘数
* @param b 乘数 * @param b 乘数
* @return 两个乘数的积, 保留两位小数 * @return 两个乘数的积, 保留6位小数
*/ */
public static BigDecimal multiply(Object a, Object b) { public static BigDecimal multiply(Object a, Object b) {
BigDecimal bdA = toBigDecimal(a); BigDecimal bdA = toBigDecimal(a);
BigDecimal bdB = toBigDecimal(b); BigDecimal bdB = toBigDecimal(b);
return bdA.multiply(bdB).setScale(2, RoundingMode.HALF_UP); return bdA.multiply(bdB).setScale(6, RoundingMode.HALF_UP);
} }
/** /**
@@ -94,7 +94,7 @@ public final class KitBigDecimalUtil {
public static BigDecimal divide(Object a, Object b) { public static BigDecimal divide(Object a, Object b) {
BigDecimal bdA = toBigDecimal(a); BigDecimal bdA = toBigDecimal(a);
BigDecimal bdB = toBigDecimal(b); BigDecimal bdB = toBigDecimal(b);
return bdA.divide(bdB, 2, RoundingMode.HALF_UP); return bdA.divide(bdB, 6, RoundingMode.HALF_UP);
} }
/** /**
cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
+4 -4
View File
@@ -30,7 +30,7 @@ import lombok.experimental.UtilityClass;
public class KitDateUtil { public class KitDateUtil {
/** /**
* 获取当前时间毫秒数 * 获取当前时间毫秒数 yyyyMMddHHmmssSSS
* *
* @return / * @return /
*/ */
@@ -39,7 +39,7 @@ public class KitDateUtil {
} }
/** /**
* 获取当前时间,但不包括毫秒数 * 获取当前时间,但不包括毫秒数 yyyyMMddHHmmss
* *
* @return / * @return /
*/ */
@@ -48,7 +48,7 @@ public class KitDateUtil {
} }
/** /**
* 获取当前时间,但不包括毫秒数 * 获取当前时间,但不包括毫秒数 yyyyMMdd
* *
* @return / * @return /
*/ */
@@ -61,7 +61,7 @@ public class KitDateUtil {
* *
* @param startTime 开始时间 * @param startTime 开始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @return 格式化后的时间，X天X时X分X秒X毫秒 * @return 格式化后的时间，X天X时X分X秒
*/ */
public static String formatMillsDuration(Date startTime, Date endTime) { public static String formatMillsDuration(Date startTime, Date endTime) {
if (startTime == null || endTime == null) { if (startTime == null || endTime == null) {
cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
+1
View File
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
* @author odboy * @author odboy
* @date 2025-04-05 * @date 2025-04-05
*/ */
@Deprecated
public final class KitDistributedIdUtil { public final class KitDistributedIdUtil {
/** /**
cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
+5 -4
View File
@@ -20,6 +20,7 @@ import static cn.odboy.constant.SystemConst.SYMBOL_AT;
import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL; import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL;
import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT; import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.BigExcelWriter;
@@ -55,7 +56,7 @@ import org.springframework.web.multipart.MultipartFile;
*/ */
@Slf4j @Slf4j
@UtilityClass @UtilityClass
public final class KitFileUtil extends cn.hutool.core.io.FileUtil { public final class KitFileUtil {
/** /**
* 系统临时目录 * 系统临时目录
@@ -92,7 +93,7 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
// 获取文件名 // 获取文件名
String fileName = multipartFile.getOriginalFilename(); String fileName = multipartFile.getOriginalFilename();
// 获取文件后缀 // 获取文件后缀
String prefix = "." + getSuffix(fileName); String prefix = "." + FileUtil.getSuffix(fileName);
File file = null; File file = null;
try { try {
// 用uuid作为文件名, 防止生成的临时文件重复 // 用uuid作为文件名, 防止生成的临时文件重复
@@ -158,8 +159,8 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
Date date = new Date(); Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssS"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssS");
// 过滤非法文件名 // 过滤非法文件名
String name = getPrefix(verifyFilename(file.getOriginalFilename())); String name = FileUtil.getPrefix(verifyFilename(file.getOriginalFilename()));
String suffix = getSuffix(file.getOriginalFilename()); String suffix = FileUtil.getSuffix(file.getOriginalFilename());
String nowStr = "-" + format.format(date); String nowStr = "-" + format.format(date);
try { try {
String fileName = name + nowStr + "." + suffix; String fileName = name + nowStr + "." + suffix;
cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
-14
View File
@@ -16,10 +16,7 @@
package cn.odboy.util; package cn.odboy.util;
import cn.odboy.base.KitPageResult; import cn.odboy.base.KitPageResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
@@ -62,13 +59,6 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
return new KitPageResult<>(list, list.size()); return new KitPageResult<>(list, list.size());
} }
/**
* 返回空数据
*/
public static <T> KitPageResult<T> emptyListData() {
return new KitPageResult<>(new ArrayList<>(), 0);
}
/** /**
* 返回空数据 * 返回空数据
*/ */
@@ -82,8 +72,4 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
public static <T> KitPageResult<T> toPage(List<T> list, long totalElements) { public static <T> KitPageResult<T> toPage(List<T> list, long totalElements) {
return new KitPageResult<>(list, totalElements); return new KitPageResult<>(list, totalElements);
} }
public static <T> Page<T> getCount(BaseMapper<T> baseMapper) {
return new Page<>(1, baseMapper.selectCount(null));
}
} }
cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
+120 -120
View File
@@ -1,120 +1,120 @@
/* /*
* Copyright 2021-2025 Odboy * Copyright 2021-2025 Odboy
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package cn.odboy.system.framework.operalog; package cn.odboy.system.framework.operalog;
import cn.hutool.core.date.TimeInterval; import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.KitRequestHolder; import cn.odboy.framework.context.KitRequestHolder;
import cn.odboy.system.dal.dataobject.SystemOperationLogTb; import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
import cn.odboy.system.dal.mysql.SystemOperationLogMapper; import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.util.KitBrowserUtil; import cn.odboy.util.KitBrowserUtil;
import cn.odboy.util.KitIPUtil; import cn.odboy.util.KitIPUtil;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* 捕捉操作日志 * 捕捉操作日志
* *
* @author odboy * @author odboy
* @date 2025-05-12 * @date 2025-05-12
*/ */
@Slf4j @Slf4j
@Aspect @Aspect
@Component @Component
public class OperationLogAspect { public class OperationLogAspect {
@Autowired @Autowired
private SystemOperationLogMapper systemOperationLogMapper; private SystemOperationLogMapper systemOperationLogMapper;
@Around("@annotation(operationLog)") @Around("@annotation(operationLog)")
public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable { public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable {
return handleLog(joinPoint, operationLog); return handleLog(joinPoint, operationLog);
} }
private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable { private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable {
TimeInterval timeInterval = new TimeInterval(); TimeInterval timeInterval = new TimeInterval();
try { try {
Object result = joinPoint.proceed(); Object result = joinPoint.proceed();
long interval = timeInterval.interval(); long interval = timeInterval.interval();
SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval); SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval);
ThreadUtil.execAsync(() -> { ThreadUtil.execAsync(() -> {
try { try {
systemOperationLogMapper.insert(record); systemOperationLogMapper.insert(record);
} catch (Exception e) { } catch (Exception e) {
// 忽略 // 忽略
} }
}); });
return result; return result;
} catch (Throwable exception) { } catch (Throwable exception) {
long interval = timeInterval.interval(); long interval = timeInterval.interval();
SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval); SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval);
record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception)); record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
ThreadUtil.execAsync(() -> { ThreadUtil.execAsync(() -> {
try { try {
systemOperationLogMapper.insert(record); systemOperationLogMapper.insert(record);
} catch (Exception e) { } catch (Exception e) {
// 忽略 // 忽略
} }
}); });
throw exception; throw exception;
} }
} }
private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation, long executeTime) { private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation, long executeTime) {
MethodSignature signature = (MethodSignature) joinPoint.getSignature(); MethodSignature signature = (MethodSignature) joinPoint.getSignature();
String bizName = annotation.bizName(); String bizName = annotation.bizName();
if (StrUtil.isBlank(bizName)) { if (StrUtil.isBlank(bizName)) {
Method method = signature.getMethod(); Method method = signature.getMethod();
ApiOperation apiOperation = method.getAnnotation(ApiOperation.class); ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
if (apiOperation != null) { if (apiOperation != null) {
bizName = apiOperation.value(); bizName = apiOperation.value();
} }
} }
if (StrUtil.isBlank(bizName)) { if (StrUtil.isBlank(bizName)) {
bizName = "默认业务"; bizName = "默认业务";
} }
String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
Object[] args = joinPoint.getArgs(); Object[] args = joinPoint.getArgs();
String params = JSON.toJSONString(args); String params = JSON.toJSONString(args);
HttpServletRequest request = KitRequestHolder.getHttpServletRequest(); HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
String requestIp = KitBrowserUtil.getIp(request); String requestIp = KitBrowserUtil.getIp(request);
String browserInfo = KitBrowserUtil.getVersion(request); String browserInfo = KitBrowserUtil.getVersion(request);
String address = KitIPUtil.getCityInfo(requestIp); String address = KitIPUtil.getCityInfo(requestIp);
String username = KitSecurityHelper.getCurrentUsername(); String username = KitSecurityHelper.getCurrentUsername();
SystemOperationLogTb record = new SystemOperationLogTb(); SystemOperationLogTb record = new SystemOperationLogTb();
record.setBizName(bizName); record.setBizName(bizName);
record.setMethod(method); record.setMethod(method);
record.setParams(params); record.setParams(params);
record.setRequestIp(requestIp); record.setRequestIp(requestIp);
record.setExecuteTime(executeTime); record.setExecuteTime(executeTime);
record.setUsername(username); record.setUsername(username);
record.setAddress(address); record.setAddress(address);
record.setBrowserInfo(browserInfo); record.setBrowserInfo(browserInfo);
return record; return record;
} }
} }
cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/SystemOperationLogAspect.java
-122
View File
@@ -1,122 +0,0 @@
/*
* Copyright 2021-2025 Odboy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.odboy.system.framework.operalog;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.KitRequestHolder;
import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.util.KitBrowserUtil;
import cn.odboy.util.KitIPUtil;
import com.alibaba.fastjson2.JSON;
import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Method;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 捕捉操作日志
*
* @author odboy
* @date 2025-05-12
*/
@Slf4j
@Aspect
@Component
public class SystemOperationLogAspect {
@Autowired
private SystemOperationLogMapper systemOperationLogMapper;
@Around("@annotation(operationLog)")
public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable {
return handleLog(joinPoint, operationLog);
}
private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable {
TimeInterval timeInterval = new TimeInterval();
try {
Object result = joinPoint.proceed();
SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
ThreadUtil.execAsync(() -> {
try {
systemOperationLogMapper.insert(record);
} catch (Exception e) {
// log.error("保存审计日志失败", e);
// 忽略
}
});
return result;
} catch (Throwable exception) {
SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
ThreadUtil.execAsync(() -> {
try {
systemOperationLogMapper.insert(record);
} catch (Exception e) {
// log.error("保存审计日志失败", e);
// 忽略
}
});
throw exception;
}
}
private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation,
TimeInterval timeInterval) {
long executeTime = timeInterval.intervalMs();
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
String bizName = annotation.bizName();
if (StrUtil.isBlank(bizName)) {
Method method = signature.getMethod();
ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
if (apiOperation != null) {
bizName = apiOperation.value();
}
}
if (StrUtil.isBlank(bizName)) {
bizName = "默认业务";
}
String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
Object[] args = joinPoint.getArgs();
String params = JSON.toJSONString(args);
HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
String requestIp = KitBrowserUtil.getIp(request);
String browserInfo = KitBrowserUtil.getVersion(request);
String address = KitIPUtil.getCityInfo(requestIp);
String username = KitSecurityHelper.getCurrentUsername();
SystemOperationLogTb record = new SystemOperationLogTb();
record.setBizName(bizName);
record.setMethod(method);
record.setParams(params);
record.setRequestIp(requestIp);
record.setExecuteTime(executeTime);
record.setUsername(username);
record.setAddress(address);
record.setBrowserInfo(browserInfo);
return record;
}
}
cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java → cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/captcha") @RequestMapping("/captcha")
@Api(tags = "系统：验证码管理") @Api(tags = "系统：验证码管理")
public class SystemCaptchaOpenController { public class OpenCaptchaController {
@Autowired @Autowired
private SystemCaptchaService systemCaptchaService; private SystemCaptchaService systemCaptchaService;