sort;
+ }
+}
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/webConfig/WebSocketConfig.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java
rename to eladmin-common/src/main/java/me/zhengjie/config/webConfig/WebSocketConfig.java
index f55f5c60..4751bb1c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java
+++ b/eladmin-common/src/main/java/me/zhengjie/config/webConfig/WebSocketConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package me.zhengjie.config.webConfig;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java b/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java
deleted file mode 100644
index ede3691f..00000000
--- a/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2019-2020 the original author or authors.
- *
- * 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 me.zhengjie.exception;
-
-/**
- * 统一关于错误配置信息 异常
- *
- * @author: liaojinlong
- * @date: 2020/6/10 18:06
- */
-public class BadConfigurationException extends RuntimeException {
- /**
- * Constructs a new runtime exception with {@code null} as its
- * detail message. The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause}.
- */
- public BadConfigurationException() {
- super();
- }
-
- /**
- * Constructs a new runtime exception with the specified detail message.
- * The cause is not initialized, and may subsequently be initialized by a
- * call to {@link #initCause}.
- *
- * @param message the detail message. The detail message is saved for
- * later retrieval by the {@link #getMessage()} method.
- */
- public BadConfigurationException(String message) {
- super(message);
- }
-
- /**
- * Constructs a new runtime exception with the specified detail message and
- * cause. Note that the detail message associated with
- * {@code cause} is not automatically incorporated in
- * this runtime exception's detail message.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A {@code null} value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @since 1.4
- */
- public BadConfigurationException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Constructs a new runtime exception with the specified cause and a
- * detail message of {@code (cause==null ? null : cause.toString())}
- * (which typically contains the class and detail message of
- * {@code cause}). This constructor is useful for runtime exceptions
- * that are little more than wrappers for other throwables.
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A {@code null} value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @since 1.4
- */
- public BadConfigurationException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a new runtime exception with the specified detail
- * message, cause, suppression enabled or disabled, and writable
- * stack trace enabled or disabled.
- *
- * @param message the detail message.
- * @param cause the cause. (A {@code null} value is permitted,
- * and indicates that the cause is nonexistent or unknown.)
- * @param enableSuppression whether or not suppression is enabled
- * or disabled
- * @param writableStackTrace whether or not the stack trace should
- * be writable
- * @since 1.7
- */
- protected BadConfigurationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- }
-}
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java b/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
index 900453bd..1d6297b9 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
+++ b/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java b/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
index 03f9bf2a..32d0e38f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
+++ b/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java b/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
index bcdc9562..4d9f4d96 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
+++ b/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java b/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
index 977788c7..aa377c4f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
+++ b/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import lombok.Data;
* @date 2018-11-23
*/
@Data
-class ApiError {
+public class ApiError {
private Integer status = 400;
private Long timestamp;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java b/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
index 23cbb383..4e4e7165 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
+++ b/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/AnonTagUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/AnonTagUtils.java
new file mode 100644
index 00000000..9a2832de
--- /dev/null
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/AnonTagUtils.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2019-2020 the original author or authors.
+ *
+ * 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 me.zhengjie.utils;
+
+import me.zhengjie.annotation.rest.AnonymousAccess;
+import me.zhengjie.utils.enums.RequestMethodEnum;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import java.util.*;
+
+/**
+ * @author Zheng Jie
+ * @description 匿名标记工具
+ * @date 2025-01-13
+ **/
+public class AnonTagUtils {
+
+ /**
+ * 获取匿名标记的URL
+ * @param applicationContext /
+ * @return /
+ */
+ public static Map> getAnonymousUrl(ApplicationContext applicationContext){
+ RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping) applicationContext.getBean("requestMappingHandlerMapping");
+ Map handlerMethodMap = requestMappingHandlerMapping.getHandlerMethods();
+ Map> anonymousUrls = new HashMap<>(8);
+ // 获取匿名标记
+ Set get = new HashSet<>();
+ Set post = new HashSet<>();
+ Set put = new HashSet<>();
+ Set patch = new HashSet<>();
+ Set delete = new HashSet<>();
+ Set all = new HashSet<>();
+ for (Map.Entry infoEntry : handlerMethodMap.entrySet()) {
+ HandlerMethod handlerMethod = infoEntry.getValue();
+ AnonymousAccess anonymousAccess = handlerMethod.getMethodAnnotation(AnonymousAccess.class);
+ if (null != anonymousAccess) {
+ List requestMethods = new ArrayList<>(infoEntry.getKey().getMethodsCondition().getMethods());
+ RequestMethodEnum request = RequestMethodEnum.find(requestMethods.isEmpty() ? RequestMethodEnum.ALL.getType() : requestMethods.get(0).name());
+ if (infoEntry.getKey().getPatternsCondition()!=null) {
+ switch (Objects.requireNonNull(request)) {
+ case GET:
+ get.addAll(infoEntry.getKey().getPatternsCondition().getPatterns());
+ break;
+ case POST:
+ post.addAll(infoEntry.getKey().getPatternsCondition().getPatterns());
+ break;
+ case PUT:
+ put.addAll(infoEntry.getKey().getPatternsCondition().getPatterns());
+ break;
+ case PATCH:
+ patch.addAll(infoEntry.getKey().getPatternsCondition().getPatterns());
+ break;
+ case DELETE:
+ delete.addAll(infoEntry.getKey().getPatternsCondition().getPatterns());
+ break;
+ default:
+ all.addAll(infoEntry.getKey().getPatternsCondition().getPatterns());
+ break;
+ }
+ }
+ }
+ }
+ anonymousUrls.put(RequestMethodEnum.GET.getType(), get);
+ anonymousUrls.put(RequestMethodEnum.POST.getType(), post);
+ anonymousUrls.put(RequestMethodEnum.PUT.getType(), put);
+ anonymousUrls.put(RequestMethodEnum.PATCH.getType(), patch);
+ anonymousUrls.put(RequestMethodEnum.DELETE.getType(), delete);
+ anonymousUrls.put(RequestMethodEnum.ALL.getType(), all);
+ return anonymousUrls;
+ }
+
+ /**
+ * 获取所有匿名标记的URL
+ * @param applicationContext /
+ * @return /
+ */
+ public static Set getAllAnonymousUrl(ApplicationContext applicationContext){
+ Set allUrl = new HashSet<>();
+ Map> anonymousUrls = getAnonymousUrl(applicationContext);
+ for (String key : anonymousUrls.keySet()) {
+ allUrl.addAll(anonymousUrls.get(key));
+ }
+ return allUrl;
+ }
+}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/BigDecimalUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/BigDecimalUtils.java
new file mode 100644
index 00000000..ff3d81fa
--- /dev/null
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/BigDecimalUtils.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2019-2020 the original author or authors.
+ *
+ * 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 me.zhengjie.utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * @author Zheng Jie
+ * @description 计算类
+ * @date 2024-12-27
+ **/
+public class BigDecimalUtils {
+
+ /**
+ * 将对象转换为 BigDecimal
+ * @param obj 输入对象
+ * @return 转换后的 BigDecimal
+ */
+ private static BigDecimal toBigDecimal(Object obj) {
+ if (obj instanceof BigDecimal) {
+ return (BigDecimal) obj;
+ } else if (obj instanceof Long) {
+ return BigDecimal.valueOf((Long) obj);
+ } else if (obj instanceof Integer) {
+ return BigDecimal.valueOf((Integer) obj);
+ } else if (obj instanceof Double) {
+ return new BigDecimal(String.valueOf(obj));
+ } else {
+ throw new IllegalArgumentException("Unsupported type");
+ }
+ }
+
+ /**
+ * 加法
+ * @param a 加数
+ * @param b 加数
+ * @return 两个加数的和，保留两位小数
+ */
+ public static BigDecimal add(Object a, Object b) {
+ BigDecimal bdA = toBigDecimal(a);
+ BigDecimal bdB = toBigDecimal(b);
+ return bdA.add(bdB).setScale(2, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 减法
+ * @param a 被减数
+ * @param b 减数
+ * @return 两数的差，保留两位小数
+ */
+ public static BigDecimal subtract(Object a, Object b) {
+ BigDecimal bdA = toBigDecimal(a);
+ BigDecimal bdB = toBigDecimal(b);
+ return bdA.subtract(bdB).setScale(2, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 乘法
+ * @param a 乘数
+ * @param b 乘数
+ * @return 两个乘数的积，保留两位小数
+ */
+ public static BigDecimal multiply(Object a, Object b) {
+ BigDecimal bdA = toBigDecimal(a);
+ BigDecimal bdB = toBigDecimal(b);
+ return bdA.multiply(bdB).setScale(2, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 除法
+ * @param a 被除数
+ * @param b 除数
+ * @return 两数的商，保留两位小数
+ */
+ public static BigDecimal divide(Object a, Object b) {
+ BigDecimal bdA = toBigDecimal(a);
+ BigDecimal bdB = toBigDecimal(b);
+ return bdA.divide(bdB, 2, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 除法
+ * @param a 被除数
+ * @param b 除数
+ * @param scale 保留小数位数
+ * @return 两数的商，保留两位小数
+ */
+ public static BigDecimal divide(Object a, Object b, int scale) {
+ BigDecimal bdA = toBigDecimal(a);
+ BigDecimal bdB = toBigDecimal(b);
+ return bdA.divide(bdB, scale, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 分转元
+ * @param obj 分的金额
+ * @return 转换后的元，保留两位小数
+ */
+ public static BigDecimal centsToYuan(Object obj) {
+ BigDecimal cents = toBigDecimal(obj);
+ return cents.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 元转分
+ * @param obj 元的金额
+ * @return 转换后的分
+ */
+ public static Long yuanToCents(Object obj) {
+ BigDecimal yuan = toBigDecimal(obj);
+ return yuan.multiply(BigDecimal.valueOf(100)).setScale(0, RoundingMode.HALF_UP).longValue();
+ }
+
+ public static void main(String[] args) {
+ BigDecimal num1 = new BigDecimal("10.123");
+ BigDecimal num2 = new BigDecimal("2.456");
+
+ System.out.println("加法结果: " + add(num1, num2));
+ System.out.println("减法结果: " + subtract(num1, num2));
+ System.out.println("乘法结果: " + multiply(num1, num2));
+ System.out.println("除法结果: " + divide(num1, num2));
+
+ Long cents = 12345L;
+ System.out.println("分转元结果: " + centsToYuan(cents));
+
+ BigDecimal yuan = new BigDecimal("123.45");
+ System.out.println("元转分结果: " + yuanToCents(yuan));
+ }
+}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java b/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java
deleted file mode 100644
index 9b108127..00000000
--- a/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2019-2020 the original author or authors.
- *
- * 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 me.zhengjie.utils;
-
-/**
- * @author: liaojinlong
- * @date: 2020/6/9 17:02
- * @since: 1.0
- * @see {@link SpringContextHolder}
- * 针对某些初始化方法，在SpringContextHolder 初始化前时，
- * 可提交一个 提交回调任务。
- * 在SpringContextHolder 初始化后，进行回调使用
- */
-
-public interface CallBack {
- /**
- * 回调执行方法
- */
- void executor();
-
- /**
- * 本回调任务名称
- * @return /
- */
- default String getCallBackName() {
- return Thread.currentThread().getId() + ":" + this.getClass().getName();
- }
-}
-
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java
index f39919f2..b095ec63 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ElConstant.java b/eladmin-common/src/main/java/me/zhengjie/utils/ElConstant.java
index 479b1e69..fa58845e 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ElConstant.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/ElConstant.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
index 191fdbbe..83bf918f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
index f0043115..a5f313cb 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,16 +19,17 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil;
+import lombok.extern.slf4j.Slf4j;
import me.zhengjie.exception.BadRequestException;
import org.apache.poi.util.IOUtils;
import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.nio.file.Files;
import java.security.MessageDigest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -44,10 +45,9 @@ import java.util.stream.Collectors;
* @author Zheng Jie
* @date 2018-12-27
*/
+@Slf4j
public class FileUtil extends cn.hutool.core.io.FileUtil {
- private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
-
/**
* 系统临时目录
*
@@ -110,7 +110,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
* 获取文件扩展名，不带 .
*/
public static String getExtensionName(String filename) {
- if ((filename != null) && (filename.length() > 0)) {
+ if ((filename != null) && (!filename.isEmpty())) {
int dot = filename.lastIndexOf('.');
if ((dot > -1) && (dot < (filename.length() - 1))) {
return filename.substring(dot + 1);
@@ -123,9 +123,9 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
* Java文件操作 获取不带扩展名的文件名
*/
public static String getFileNameNoEx(String filename) {
- if ((filename != null) && (filename.length() > 0)) {
+ if ((filename != null) && (!filename.isEmpty())) {
int dot = filename.lastIndexOf('.');
- if ((dot > -1) && (dot < (filename.length()))) {
+ if (dot > -1) {
return filename.substring(0, dot);
}
}
@@ -162,7 +162,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
}
OutputStream os = null;
try {
- os = new FileOutputStream(file);
+ os = Files.newOutputStream(file.toPath());
int bytesRead;
int len = 8192;
byte[] buffer = new byte[len];
@@ -170,7 +170,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
os.write(buffer, 0, bytesRead);
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} finally {
CloseUtil.close(os);
CloseUtil.close(ins);
@@ -301,7 +301,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
byte[] b = new byte[(int) file.length()];
InputStream in = null;
try {
- in = new FileInputStream(file);
+ in = Files.newInputStream(file.toPath());
try {
System.out.println(in.read(b));
} catch (IOException e) {
@@ -407,7 +407,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
return fileName;
}
-
public static String getMd5(File file) {
return getMd5(getByte(file));
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java b/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java
index 0f1fdfe2..f6019cd8 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java
@@ -1,16 +1,24 @@
package me.zhengjie.utils;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.List;
-@Getter
-@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
-public class PageResult {
+/**
+ * 分页结果封装类
+ * @author Zheng Jie
+ * @date 2018-11-23
+ * @param
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageResult implements Serializable {
- private final List content;
+ private List content;
- private final long totalElements;
+ private long totalElements;
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
index 56020d98..cbb99e54 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
index 587ece98..cbb8b65f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
index 65d02789..21480065 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
*/
package me.zhengjie.utils;
+import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
@@ -24,14 +25,16 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.*;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import org.springframework.stereotype.Component;
+
import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* @author /
*/
@Component
-@SuppressWarnings({"unchecked", "all"})
+@SuppressWarnings({"all"})
public class RedisUtils {
private static final Logger log = LoggerFactory.getLogger(RedisUtils.class);
@@ -39,9 +42,8 @@ public class RedisUtils {
public RedisUtils(RedisTemplate redisTemplate) {
this.redisTemplate = redisTemplate;
- this.redisTemplate.setHashKeySerializer(new StringRedisSerializer());
this.redisTemplate.setKeySerializer(new StringRedisSerializer());
- this.redisTemplate.setStringSerializer(new StringRedisSerializer());
+ this.redisTemplate.setHashKeySerializer(new StringRedisSerializer());
}
/**
@@ -221,6 +223,65 @@ public class RedisUtils {
return key == null ? null : redisTemplate.opsForValue().get(key);
}
+ /**
+ * 普通缓存获取
+ *
+ * @param key 键
+ * @return 值
+ */
+ public T get(String key, Class clazz) {
+ Object value = key == null ? null : redisTemplate.opsForValue().get(key);
+ if (value == null) {
+ return null;
+ }
+ if (clazz.isInstance(value)) {
+ return clazz.cast(value);
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * 普通缓存获取
+ *
+ * @param key 键
+ * @param clazz 列表中元素的类型
+ * @return 值
+ */
+ public List getList(String key, Class clazz) {
+ Object value = key == null ? null : redisTemplate.opsForValue().get(key);
+ if (value == null) {
+ return null;
+ }
+ if (value instanceof List) {
+ List list = (List) value;
+ // 检查每个元素是否为指定类型
+ if (list.stream().allMatch(clazz::isInstance)) {
+ return list.stream().map(clazz::cast).collect(Collectors.toList());
+ }
+ }
+ return null;
+ }
+
+
+ /**
+ * 普通缓存获取
+ *
+ * @param key 键
+ * @return 值
+ */
+ public String getStr(String key) {
+ if(StrUtil.isBlank(key)){
+ return null;
+ }
+ Object value = redisTemplate.opsForValue().get(key);
+ if (value == null) {
+ return null;
+ } else {
+ return String.valueOf(value);
+ }
+ }
+
/**
* 批量获取
*
@@ -242,13 +303,17 @@ public class RedisUtils {
* @return true成功 false失败
*/
public boolean set(String key, Object value) {
- try {
- redisTemplate.opsForValue().set(key, value);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
+ int attempt = 0;
+ while (attempt < 3) {
+ try {
+ redisTemplate.opsForValue().set(key, value);
+ return true;
+ } catch (Exception e) {
+ attempt++;
+ log.error("Attempt {} failed: {}", attempt, e.getMessage(), e);
+ }
}
+ return false;
}
/**
@@ -716,10 +781,25 @@ public class RedisUtils {
keys.addAll(redisTemplate.keys(new StringBuffer(prefix).append(id).toString()));
}
long count = redisTemplate.delete(keys);
- // 此处提示可自行删除
- log.debug("--------------------------------------------");
- log.debug("成功删除缓存：" + keys.toString());
- log.debug("缓存删除数量：" + count + "个");
- log.debug("--------------------------------------------");
+ }
+
+ // ============================incr=============================
+
+ /**
+ * 递增
+ * @param key
+ * @return
+ */
+ public Long increment(String key) {
+ return redisTemplate.opsForValue().increment(key);
+ }
+
+ /**
+ * 递减
+ * @param key
+ * @return
+ */
+ public Long decrement(String key) {
+ return redisTemplate.opsForValue().decrement(key);
}
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java b/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
index 71a4b9e5..8d90ac48 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
index 28e4672c..fb98424a 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,18 +15,24 @@
*/
package me.zhengjie.utils;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.jwt.JWT;
+import cn.hutool.jwt.JWTUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.exception.BadRequestException;
import me.zhengjie.utils.enums.DataScopeEnum;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.Objects;
/**
* 获取当前登录的用户
@@ -34,45 +40,32 @@ import java.util.List;
* @date 2019-01-17
*/
@Slf4j
+@Component
public class SecurityUtils {
+ public static String header;
+
+ public static String tokenStartWith;
+
+ @Value("${jwt.header}")
+ public void setHeader(String header) {
+ SecurityUtils.header = header;
+ }
+
+ @Value("${jwt.token-start-with}")
+ public void setTokenStartWith(String tokenStartWith) {
+ SecurityUtils.tokenStartWith = tokenStartWith;
+ }
+
/**
* 获取当前登录的用户
* @return UserDetails
*/
public static UserDetails getCurrentUser() {
- UserDetailsService userDetailsService = SpringContextHolder.getBean(UserDetailsService.class);
+ UserDetailsService userDetailsService = SpringBeanHolder.getBean(UserDetailsService.class);
return userDetailsService.loadUserByUsername(getCurrentUsername());
}
- /**
- * 获取系统用户名称
- *
- * @return 系统用户名称
- */
- public static String getCurrentUsername() {
- final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (authentication == null) {
- throw new BadRequestException(HttpStatus.UNAUTHORIZED, "当前登录状态过期");
- }
- if (authentication.getPrincipal() instanceof UserDetails) {
- UserDetails userDetails = (UserDetails) authentication.getPrincipal();
- return userDetails.getUsername();
- }
- throw new BadRequestException(HttpStatus.UNAUTHORIZED, "找不到当前登录的信息");
- }
-
- /**
- * 获取系统用户ID
- * @return 系统用户ID
- */
- public static Long getCurrentUserId() {
- UserDetails userDetails = getCurrentUser();
- // 将 Java 对象转换为 JSONObject 对象
- JSONObject jsonObject = (JSONObject) JSON.toJSON(userDetails);
- return jsonObject.getJSONObject("user").getLong("id");
- }
-
/**
* 获取当前用户的数据权限
* @return /
@@ -91,9 +84,62 @@ public class SecurityUtils {
*/
public static String getDataScopeType() {
List dataScopes = getCurrentUserDataScope();
- if(dataScopes.size() != 0){
+ if(CollUtil.isEmpty(dataScopes)){
return "";
}
return DataScopeEnum.ALL.getValue();
}
+
+ /**
+ * 获取用户ID
+ * @return 系统用户ID
+ */
+ public static Long getCurrentUserId() {
+ return getCurrentUserId(getToken());
+ }
+
+ /**
+ * 获取用户ID
+ * @return 系统用户ID
+ */
+ public static Long getCurrentUserId(String token) {
+ JWT jwt = JWTUtil.parseToken(token);
+ return Long.valueOf(jwt.getPayload("userId").toString());
+ }
+
+ /**
+ * 获取系统用户名称
+ *
+ * @return 系统用户名称
+ */
+ public static String getCurrentUsername() {
+ return getCurrentUsername(getToken());
+ }
+
+ /**
+ * 获取系统用户名称
+ *
+ * @return 系统用户名称
+ */
+ public static String getCurrentUsername(String token) {
+ JWT jwt = JWTUtil.parseToken(token);
+ return jwt.getPayload("sub").toString();
+ }
+
+ /**
+ * 获取Token
+ * @return /
+ */
+ public static String getToken() {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder
+ .getRequestAttributes())).getRequest();
+ String bearerToken = request.getHeader(header);
+ if (bearerToken != null && bearerToken.startsWith(tokenStartWith)) {
+ // 去掉令牌前缀
+ return bearerToken.replace(tokenStartWith, "");
+ } else {
+ log.debug("非法Token：{}", bearerToken);
+ }
+ return null;
+ }
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java b/eladmin-common/src/main/java/me/zhengjie/utils/SpringBeanHolder.java
similarity index 80%
rename from eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java
rename to eladmin-common/src/main/java/me/zhengjie/utils/SpringBeanHolder.java
index 41ead386..ca9cdfc0 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/SpringBeanHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,10 +31,11 @@ import java.util.List;
* @date 2019-01-07
*/
@Slf4j
-public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
+@SuppressWarnings("all")
+public class SpringBeanHolder implements ApplicationContextAware, DisposableBean {
private static ApplicationContext applicationContext = null;
- private static final List CALL_BACKS = new ArrayList<>();
+ private static final List CALL_BACKS = new ArrayList<>();
private static boolean addCallback = true;
/**
@@ -43,9 +44,9 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
*
* @param callBack 回调函数
*/
- public synchronized static void addCallBacks(CallBack callBack) {
+ public synchronized static void addCallBacks(SpringBeanHolder.CallBack callBack) {
if (addCallback) {
- SpringContextHolder.CALL_BACKS.add(callBack);
+ SpringBeanHolder.CALL_BACKS.add(callBack);
} else {
log.warn("CallBack：{} 已无法添加！立即执行", callBack.getCallBackName());
callBack.executor();
@@ -55,7 +56,6 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
/**
* 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型.
*/
- @SuppressWarnings("unchecked")
public static T getBean(String name) {
assertContextInjected();
return (T) applicationContext.getBean(name);
@@ -127,22 +127,22 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
@Override
public void destroy() {
- SpringContextHolder.clearHolder();
+ SpringBeanHolder.clearHolder();
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- if (SpringContextHolder.applicationContext != null) {
- log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
+ if (SpringBeanHolder.applicationContext != null) {
+ log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringBeanHolder.applicationContext);
}
- SpringContextHolder.applicationContext = applicationContext;
+ SpringBeanHolder.applicationContext = applicationContext;
if (addCallback) {
- for (CallBack callBack : SpringContextHolder.CALL_BACKS) {
+ for (SpringBeanHolder.CallBack callBack : SpringBeanHolder.CALL_BACKS) {
callBack.executor();
}
CALL_BACKS.clear();
}
- SpringContextHolder.addCallback = false;
+ SpringBeanHolder.addCallback = false;
}
/**
@@ -153,4 +153,20 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
return new ArrayList<>(Arrays.asList(applicationContext
.getBeanNamesForAnnotation(Service.class)));
}
+
+ interface CallBack {
+
+ /**
+ * 回调执行方法
+ */
+ void executor();
+
+ /**
+ * 本回调任务名称
+ * @return /
+ */
+ default String getCallBackName() {
+ return Thread.currentThread().getId() + ":" + this.getClass().getName();
+ }
+ }
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
index a27a47a9..6c189376 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
* 注入bean
*/
- private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class);
+ private final static Ip2regionSearcher IP_SEARCHER = SpringBeanHolder.getBean(Ip2regionSearcher.class);
/**
* 驼峰命名法工具
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
index 075a65c5..59f1d98f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
index e561762b..2e82d6c4 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
index 944bc71c..2c6fbb6b 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java
index 916862a6..3993993f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
index 465eef65..08e41f66 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
index 7de5146c..5d944835 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java
index fdb962a4..fddc1993 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import java.io.Serializable;
@Setter
@Entity
@NoArgsConstructor
-@Table(name = "code_column_config")
+@Table(name = "code_column")
public class ColumnInfo implements Serializable {
@Id
diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
index a2d67063..47e87d31 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import java.io.Serializable;
@Setter
@Entity
@NoArgsConstructor
-@Table(name = "code_gen_config")
+@Table(name = "code_config")
public class GenConfig implements Serializable {
public GenConfig(String tableName) {
diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
index 1d3967b5..c900a654 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
*/
package me.zhengjie.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -29,20 +31,19 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class TableInfo {
- /** 表名称 */
+ @ApiModelProperty(value = "表名称")
private Object tableName;
- /** 创建日期 */
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期：yyyy-MM-dd HH:mm:ss")
private Object createTime;
- /** 数据库引擎 */
+ @ApiModelProperty(value = "数据库引擎")
private Object engine;
- /** 编码集 */
+ @ApiModelProperty(value = "编码集")
private Object coding;
- /** 备注 */
+ @ApiModelProperty(value = "备注")
private Object remark;
-
-
}
diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java
index 4638be26..7a174d2d 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
index 18c9a0c8..1513c810 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
index d4cbec91..85a2a4bb 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
index 4a1f1e4e..68148b94 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
index b5711f48..175439ab 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
index b9c2a2f5..6e59160a 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import me.zhengjie.domain.ColumnInfo;
import me.zhengjie.domain.vo.TableInfo;
import me.zhengjie.utils.PageResult;
import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Async;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
index bc2d061d..5801d983 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import lombok.RequiredArgsConstructor;
import me.zhengjie.domain.GenConfig;
import me.zhengjie.repository.GenConfigRepository;
import me.zhengjie.service.GenConfigService;
-import me.zhengjie.utils.StringUtils;
import org.springframework.stereotype.Service;
import java.io.File;
@@ -29,6 +28,7 @@ import java.io.File;
*/
@Service
@RequiredArgsConstructor
+@SuppressWarnings({"unchecked","all"})
public class GenConfigServiceImpl implements GenConfigService {
private final GenConfigRepository genConfigRepository;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
index 604cf2db..fdd0a0ae 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ import java.util.stream.Collectors;
*/
@Service
@RequiredArgsConstructor
+@SuppressWarnings({"unchecked","all"})
public class GeneratorServiceImpl implements GeneratorService {
private static final Logger log = LoggerFactory.getLogger(GeneratorServiceImpl.class);
@PersistenceContext
diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
index b5fcd6b7..cee76364 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public class ColUtil {
*/
public static PropertiesConfiguration getConfig() {
try {
- return new PropertiesConfiguration("generator.properties");
+ return new PropertiesConfiguration("gen.properties");
} catch (ConfigurationException e) {
log.error(e.getMessage(), e);
}
diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
index 8c8a95aa..bb5a85e4 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 Zheng Jie
+ * Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/eladmin-generator/src/main/resources/generator.properties b/eladmin-generator/src/main/resources/gen.properties
similarity index 100%
rename from eladmin-generator/src/main/resources/generator.properties
rename to eladmin-generator/src/main/resources/gen.properties
diff --git a/eladmin-generator/src/main/resources/template/admin/Controller.ftl b/eladmin-generator/src/main/resources/template/admin/Controller.ftl
index a7d6d754..215fc953 100644
--- a/eladmin-generator/src/main/resources/template/admin/Controller.ftl
+++ b/eladmin-generator/src/main/resources/template/admin/Controller.ftl
@@ -1,5 +1,5 @@
/*
-* Copyright 2019-2020 Zheng Jie
+* Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,13 +39,12 @@ import ${package}.service.dto.${className}Dto;
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "${apiAlias}管理")
+@Api(tags = "${apiAlias}")
@RequestMapping("/api/${changeClassName}")
public class ${className}Controller {
private final ${className}Service ${changeClassName}Service;
- @Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('${changeClassName}:list')")
@@ -54,7 +53,6 @@ public class ${className}Controller {
}
@GetMapping
- @Log("查询${apiAlias}")
@ApiOperation("查询${apiAlias}")
@PreAuthorize("@el.check('${changeClassName}:list')")
public ResponseEntity> query${className}(${className}QueryCriteria criteria, Pageable pageable){
@@ -83,7 +81,7 @@ public class ${className}Controller {
@Log("删除${apiAlias}")
@ApiOperation("删除${apiAlias}")
@PreAuthorize("@el.check('${changeClassName}:del')")
- public ResponseEntity