refactor(springboot-parent): 升级至 Java 17 及 Jakarta 包迁移

springboot-util/src/main/java/com/tiesheng/util/ServletKit.java

@@ -1,12 +1,337 @@
 package com.tiesheng.util;
 
-import cn.hutool.extra.servlet.ServletUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.bean.copier.ValueProvider;
+import cn.hutool.core.collection.ArrayIter;
+import cn.hutool.core.collection.IterUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.exceptions.UtilException;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.map.CaseInsensitiveMap;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.net.multipart.MultipartFormData;
+import cn.hutool.core.net.multipart.UploadSetting;
+import cn.hutool.core.util.*;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.lang.reflect.Type;
+import java.nio.charset.Charset;
+import java.util.*;
 
-public class ServletKit extends ServletUtil {
+public class ServletKit {
+
+    public static final String METHOD_DELETE = "DELETE";
+    public static final String METHOD_HEAD = "HEAD";
+    public static final String METHOD_GET = "GET";
+    public static final String METHOD_OPTIONS = "OPTIONS";
+    public static final String METHOD_POST = "POST";
+    public static final String METHOD_PUT = "PUT";
+    public static final String METHOD_TRACE = "TRACE";
+
+    public static Map<String, String[]> getParams(ServletRequest request) {
+        Map<String, String[]> map = request.getParameterMap();
+        return Collections.unmodifiableMap(map);
+    }
+
+    public static Map<String, String> getParamMap(ServletRequest request) {
+        Map<String, String> params = new HashMap();
+
+        for (Map.Entry<String, String[]> entry : getParams(request).entrySet()) {
+            params.put(entry.getKey(), ArrayUtil.join(entry.getValue(), ","));
+        }
+
+        return params;
+    }
+
+    public static String getBody(ServletRequest request) {
+        try (BufferedReader reader = request.getReader()) {
+            String var3 = IoUtil.read(reader);
+            return var3;
+        } catch (IOException e) {
+            throw new IORuntimeException(e);
+        }
+    }
+
+    public static byte[] getBodyBytes(ServletRequest request) {
+        try {
+            return IoUtil.readBytes(request.getInputStream());
+        } catch (IOException e) {
+            throw new IORuntimeException(e);
+        }
+    }
+
+    public static <T> T fillBean(final ServletRequest request, T bean, CopyOptions copyOptions) {
+        final String beanName = StrUtil.lowerFirst(bean.getClass().getSimpleName());
+        return (T) BeanUtil.fillBean(bean, new ValueProvider<String>() {
+            public Object value(String key, Type valueType) {
+                String[] values = request.getParameterValues(key);
+                if (ArrayUtil.isEmpty(values)) {
+                    values = request.getParameterValues(beanName + "." + key);
+                    if (ArrayUtil.isEmpty(values)) {
+                        return null;
+                    }
+                }
+
+                return 1 == values.length ? values[0] : values;
+            }
+
+            public boolean containsKey(String key) {
+                return null != request.getParameter(key) || null != request.getParameter(beanName + "." + key);
+            }
+        }, copyOptions);
+    }
+
+    public static <T> T fillBean(ServletRequest request, T bean, boolean isIgnoreError) {
+        return (T) fillBean(request, bean, CopyOptions.create().setIgnoreError(isIgnoreError));
+    }
+
+    public static <T> T toBean(ServletRequest request, Class<T> beanClass, boolean isIgnoreError) {
+        return (T) fillBean(request, ReflectUtil.newInstanceIfPossible(beanClass), isIgnoreError);
+    }
+
+    public static String getClientIP(HttpServletRequest request, String... otherHeaderNames) {
+        String[] headers = new String[]{"X-Forwarded-For", "X-Real-IP", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR"};
+        if (ArrayUtil.isNotEmpty(otherHeaderNames)) {
+            headers = (String[]) ArrayUtil.addAll(new String[][]{otherHeaderNames, headers});
+        }
+
+        return getClientIPByHeader(request, headers);
+    }
+
+    public static String getClientIPByHeader(HttpServletRequest request, String... headerNames) {
+        for (String header : headerNames) {
+            String ip = request.getHeader(header);
+            if (!NetUtil.isUnknown(ip)) {
+                return NetUtil.getMultistageReverseProxyIp(ip);
+            }
+        }
+
+        String ip = request.getRemoteAddr();
+        return NetUtil.getMultistageReverseProxyIp(ip);
+    }
+
+    public static MultipartFormData getMultipart(ServletRequest request) throws IORuntimeException {
+        return getMultipart(request, new UploadSetting());
+    }
+
+    public static MultipartFormData getMultipart(ServletRequest request, UploadSetting uploadSetting) throws IORuntimeException {
+        MultipartFormData formData = new MultipartFormData(uploadSetting);
+
+        try {
+            formData.parseRequestStream(request.getInputStream(), CharsetUtil.charset(request.getCharacterEncoding()));
+            return formData;
+        } catch (IOException e) {
+            throw new IORuntimeException(e);
+        }
+    }
+
+    public static Map<String, String> getHeaderMap(HttpServletRequest request) {
+        Map<String, String> headerMap = new HashMap();
+        Enumeration<String> names = request.getHeaderNames();
+
+        while (names.hasMoreElements()) {
+            String name = (String) names.nextElement();
+            headerMap.put(name, request.getHeader(name));
+        }
+
+        return headerMap;
+    }
+
+    public static Map<String, List<String>> getHeadersMap(HttpServletRequest request) {
+        Map<String, List<String>> headerMap = new LinkedHashMap();
+        Enumeration<String> names = request.getHeaderNames();
+
+        while (names.hasMoreElements()) {
+            String name = (String) names.nextElement();
+            headerMap.put(name, ListUtil.list(false, request.getHeaders(name)));
+        }
+
+        return headerMap;
+    }
+
+    public static Map<String, Collection<String>> getHeadersMap(HttpServletResponse response) {
+        Map<String, Collection<String>> headerMap = new HashMap();
+
+        for (String name : response.getHeaderNames()) {
+            headerMap.put(name, response.getHeaders(name));
+        }
+
+        return headerMap;
+    }
+
+    public static String getHeaderIgnoreCase(HttpServletRequest request, String nameIgnoreCase) {
+        Enumeration<String> names = request.getHeaderNames();
+
+        while (names.hasMoreElements()) {
+            String name = (String) names.nextElement();
+            if (name != null && name.equalsIgnoreCase(nameIgnoreCase)) {
+                return request.getHeader(name);
+            }
+        }
+
+        return null;
+    }
+
+    public static String getHeader(HttpServletRequest request, String name, String charsetName) {
+        return getHeader(request, name, CharsetUtil.charset(charsetName));
+    }
+
+    public static String getHeader(HttpServletRequest request, String name, Charset charset) {
+        String header = request.getHeader(name);
+        return null != header ? CharsetUtil.convert(header, CharsetUtil.CHARSET_ISO_8859_1, charset) : null;
+    }
+
+    public static boolean isIE(HttpServletRequest request) {
+        String userAgent = getHeaderIgnoreCase(request, "User-Agent");
+        if (!StrUtil.isNotBlank(userAgent)) {
+            return false;
+        } else {
+            userAgent = userAgent.toUpperCase();
+            return userAgent.contains("MSIE") || userAgent.contains("TRIDENT");
+        }
+    }
+
+    public static boolean isGetMethod(HttpServletRequest request) {
+        return "GET".equalsIgnoreCase(request.getMethod());
+    }
+
+    public static boolean isPostMethod(HttpServletRequest request) {
+        return "POST".equalsIgnoreCase(request.getMethod());
+    }
+
+    public static boolean isMultipart(HttpServletRequest request) {
+        if (!isPostMethod(request)) {
+            return false;
+        } else {
+            String contentType = request.getContentType();
+            return StrUtil.isBlank(contentType) ? false : contentType.toLowerCase().startsWith("multipart/");
+        }
+    }
+
+    public static Cookie getCookie(HttpServletRequest httpServletRequest, String name) {
+        return readCookieMap(httpServletRequest).get(name);
+    }
+
+    public static Map<String, Cookie> readCookieMap(HttpServletRequest httpServletRequest) {
+        Cookie[] cookies = httpServletRequest.getCookies();
+        return ArrayUtil.isEmpty(cookies) ? MapUtil.empty() : IterUtil.toMap(new ArrayIter(httpServletRequest.getCookies()), new CaseInsensitiveMap(), Cookie::getName);
+    }
+
+    public static void addCookie(HttpServletResponse response, Cookie cookie) {
+        response.addCookie(cookie);
+    }
+
+    public static void addCookie(HttpServletResponse response, String name, String value) {
+        response.addCookie(new Cookie(name, value));
+    }
+
+    public static void addCookie(HttpServletResponse response, String name, String value, int maxAgeInSeconds, String path, String domain) {
+        Cookie cookie = new Cookie(name, value);
+        if (domain != null) {
+            cookie.setDomain(domain);
+        }
+
+        cookie.setMaxAge(maxAgeInSeconds);
+        cookie.setPath(path);
+        addCookie(response, cookie);
+    }
+
+    public static void addCookie(HttpServletResponse response, String name, String value, int maxAgeInSeconds) {
+        addCookie(response, name, value, maxAgeInSeconds, "/", (String) null);
+    }
+
+    public static PrintWriter getWriter(HttpServletResponse response) throws IORuntimeException {
+        try {
+            return response.getWriter();
+        } catch (IOException e) {
+            throw new IORuntimeException(e);
+        }
+    }
+
+    public static void write(HttpServletResponse response, String text, String contentType) {
+        response.setContentType(contentType);
+        Writer writer = null;
+
+        try {
+            writer = response.getWriter();
+            writer.write(text);
+            writer.flush();
+        } catch (IOException e) {
+            throw new UtilException(e);
+        } finally {
+            IoUtil.close(writer);
+        }
+
+    }
+
+    public static void write(HttpServletResponse response, File file) {
+        String fileName = file.getName();
+        String contentType = (String) ObjectUtil.defaultIfNull(FileUtil.getMimeType(fileName), "application/octet-stream");
+        BufferedInputStream in = null;
+
+        try {
+            in = FileUtil.getInputStream(file);
+            write(response, in, contentType, fileName);
+        } finally {
+            IoUtil.close(in);
+        }
+
+    }
+
+    public static void write(HttpServletResponse response, InputStream in, String contentType, String fileName) {
+        String charset = (String) ObjectUtil.defaultIfNull(response.getCharacterEncoding(), "UTF-8");
+        String encodeText = URLUtil.encodeAll(fileName, CharsetUtil.charset(charset));
+        response.setHeader("Content-Disposition", StrUtil.format("attachment;filename=\"{}\";filename*={}''{}", new Object[]{encodeText, charset, encodeText}));
+        response.setContentType(contentType);
+        write(response, in);
+    }
+
+    public static void write(HttpServletResponse response, InputStream in, String contentType) {
+        response.setContentType(contentType);
+        write(response, in);
+    }
+
+    public static void write(HttpServletResponse response, InputStream in) {
+        write(response, in, 8192);
+    }
+
+    public static void write(HttpServletResponse response, InputStream in, int bufferSize) {
+        ServletOutputStream out = null;
+
+        try {
+            out = response.getOutputStream();
+            IoUtil.copy(in, out, bufferSize);
+        } catch (IOException e) {
+            throw new UtilException(e);
+        } finally {
+            IoUtil.close(out);
+            IoUtil.close(in);
+        }
+
+    }
+
+    public static void setHeader(HttpServletResponse response, String name, Object value) {
+        if (value instanceof String) {
+            response.setHeader(name, (String) value);
+        } else if (Date.class.isAssignableFrom(value.getClass())) {
+            response.setDateHeader(name, ((Date) value).getTime());
+        } else if (!(value instanceof Integer) && !"int".equalsIgnoreCase(value.getClass().getSimpleName())) {
+            response.setHeader(name, value.toString());
+        } else {
+            response.setIntHeader(name, (Integer) value);
+        }
+    }
 
 
     /**

springboot-util/src/main/java/com/tiesheng/util/config/GlobalConfig.java

@@ -9,12 +9,12 @@ import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.tiesheng.util.exception.ApiException;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;

springboot-util/src/main/java/com/tiesheng/util/config/Ip2regionConfig.java

@@ -4,11 +4,10 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.log.LogFactory;
 import com.tiesheng.util.ip2region.Searcher;
 import com.tiesheng.util.service.http.OkHttpUtil;
+import jakarta.annotation.PostConstruct;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-
 /**
  * @author hao
  */

springboot-util/src/main/java/com/tiesheng/util/config/TsTokenConfig.java

@@ -3,16 +3,16 @@ package com.tiesheng.util.config;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSON;
+import com.tiesheng.util.ServletKit;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.jwt.JWT;
 import com.tiesheng.util.jwt.JWTValidator;
 import com.tiesheng.util.pojos.TokenBean;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 
@@ -62,7 +62,7 @@ public class TsTokenConfig {
      * @return
      */
     public TokenBean validToken(HttpServletRequest request, boolean thrExp) {
-        String token = ServletUtil.getHeader(request, TOKEN_KEY, "utf-8");
+        String token = ServletKit.getHeader(request, TOKEN_KEY, "utf-8");
         return validToken(token, thrExp);
     }
 

springboot-util/src/main/java/com/tiesheng/util/pojos/IdDTO.java

@@ -1,6 +1,7 @@
 package com.tiesheng.util.pojos;
 
-import javax.validation.constraints.NotEmpty;
+
+import jakarta.validation.constraints.NotEmpty;
 
 public class IdDTO {
 
@@ -9,7 +10,8 @@ public class IdDTO {
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public String getId() {
         return id;

springboot-util/src/main/java/com/tiesheng/util/service/cache/TsCacheRedisHandler.java

@@ -5,8 +5,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
 
-import javax.annotation.Resource;
-import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;