优化工具类

4dkankan-common-utils/pom.xml

@@ -43,10 +43,6 @@
             <artifactId>jave</artifactId>
             <version>1.0.2.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -54,12 +50,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>5.3.13</version>
-        </dependency>
-
-        <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
             <version>3.10.3</version>
@@ -93,17 +83,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
 
         <dependency>
             <groupId>joda-time</groupId>
@@ -115,14 +94,5 @@
             <artifactId>okhttp</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-            <scope>compile</scope>
-            <version>3.4.3.4</version>
-        </dependency>
-
-
-
     </dependencies>
 </project>

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/DataUtils.java

@@ -1,8 +1,7 @@
 package com.fdkankan.common.util;
 
 import cn.hutool.core.util.StrUtil;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -13,7 +12,6 @@ import java.util.Map;
  * @date 2020/4/23 17:35
  * @desciption
  */
-@Component
 public class DataUtils {
 
     public static BigDecimal getBigDecimalObj(Object data) {
@@ -112,25 +110,4 @@ public class DataUtils {
         resultMap.put("list", list);
         return resultMap;
     }
-
-//    public static <T> void assembleTimeQueryWrapper(Map<String, Object> constantQuery, String dynamicQuery,
-//                                                    QueryWrapper<T> queryWrapper, String idQuery,
-//                                                    String secondQuery, String thirdQuery) {
-//        assembleConstantQuery(queryWrapper, constantQuery);
-//        if (org.apache.commons.lang3.StringUtils.isNotBlank(dynamicQuery)) {
-//            queryWrapper.and(wrapper -> wrapper
-//                    .or().like(org.apache.commons.lang3.StringUtils.isNotBlank(secondQuery), secondQuery, dynamicQuery)
-//                    .or().like(org.apache.commons.lang3.StringUtils.isNotBlank(thirdQuery), thirdQuery, dynamicQuery)
-//                    .or().like(dynamicQuery.length() <= 32 && org.apache.commons.lang3.StringUtils.isNotBlank(idQuery), idQuery, dynamicQuery));
-//        }
-//
-//    }
-
-//    public static <T> void assembleConstantQuery(QueryWrapper<T> queryWrapper, Map<String, Object> constantQuery) {
-//        if (null != queryWrapper && !CollectionUtils.isEmpty(constantQuery)) {
-//            for (Map.Entry<String, Object> entry : constantQuery.entrySet()) {
-//                queryWrapper.eq(entry.getKey(), entry.getValue());
-//            }
-//        }
-//    }
 }

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/FileUtils.java

@@ -15,7 +15,6 @@ import org.bytedeco.javacv.Java2DFrameConverter;
 import org.bytedeco.javacv.OpenCVFrameConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.ResourceUtils;
 import sun.misc.BASE64Decoder;
 
 import javax.imageio.ImageIO;
@@ -567,17 +566,17 @@ public class FileUtils {
     }
 
     /**
-     * 获取类路径（classes路径）
+     * 已移除，请在项目中自行实现
      */
-    public static String getResource(){
-        String path = "";
-        try {
-            path = ResourceUtils.getURL("classpath:").getPath();
-            path = URLDecoder.decode(path,"utf-8");
-        } catch (Exception e) {
-        }
-        return path;
-    }
+//    public static String getResource(){
+//        String path = "";
+//        try {
+//            path = ResourceUtils.getURL("classpath:").getPath();
+//            path = URLDecoder.decode(path,"utf-8");
+//        } catch (Exception e) {
+//        }
+//        return path;
+//    }
 
     /**
      * 判断文件大小处于限制内

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/OkHttpUtils.java

@@ -1,8 +1,9 @@
 package com.fdkankan.common.util;
 
+import cn.hutool.core.collection.CollectionUtil;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
-import org.springframework.util.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -68,7 +69,7 @@ public class OkHttpUtils {
     }
 
     public static String httpGet(String url, Map<String, String> headers) {
-        if (CollectionUtils.isEmpty(headers)) {
+        if (ObjectUtils.isEmpty(headers)) {
             return httpGet(url);
         }
 
@@ -166,7 +167,7 @@ public class OkHttpUtils {
      * @return
      */
     public static String httpPostJson(String url, Map<String, String> headers, String json) {
-        if (CollectionUtils.isEmpty(headers)) {
+        if (CollectionUtil.isEmpty(headers)) {
             httpPostJson(url, json);
         }
 

4dkankan-common-utils/src/main/java/com/fdkankan/common/validation/ValidationUtils.java

@@ -1,6 +1,6 @@
 package com.fdkankan.common.validation;
 
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

4dkankan-common-utils/src/main/java/com/fdkankan/common/validation/Variable.java

@@ -1,24 +0,0 @@
-package com.fdkankan.common.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-public class Variable {
-
-    //public static Map<String,String> gl_AppSession = new HashMap<String,String>();
-
-    //二维码登录
-    public static Map<String,String> globalCodeLogin = new HashMap<String,String>();
-
-    public static ConcurrentLinkedQueue<String> queue = new ConcurrentLinkedQueue<String>();
-
-    //更新浏览大场景次数
-    public static Map<String, Integer> globalViewCount = new ConcurrentHashMap<String, Integer>();
-
-    //微信支付，原始订单对应后面添加了随机数的订单
-    public static Map<String, String> globalOrders = new ConcurrentHashMap<String, String>();
-
-//	public static ComputerModel[] thread_computers = null;
-}

4dkankan-common-web/src/main/java/com/fdkankan/web/controller/CustomErrorController.java

@@ -1,6 +1,6 @@
 package com.fdkankan.web.controller;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.boot.web.servlet.error.ErrorController;

4dkankan-common-web/src/main/java/com/fdkankan/web/exception/GlobalExceptionHandler.java

@@ -4,7 +4,7 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

4dkankan-common-web/src/main/java/com/fdkankan/web/jwt/JwtFilter.java

@@ -2,7 +2,7 @@ package com.fdkankan.web.jwt;
 
 import com.alibaba.fastjson.JSON;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.servlet.ServletRequest;

4dkankan-common-utils/src/main/java/com/fdkankan/common/request/RequestBase.java

@@ -1,4 +1,4 @@
-package com.fdkankan.common.request;
+package com.fdkankan.web.request;
 
 import lombok.Data;
 

4dkankan-common-web/src/main/java/com/fdkankan/web/response/BaseResponseAdvice.java

@@ -3,8 +3,6 @@ package com.fdkankan.web.response;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.common.response.ResultData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
@@ -41,10 +39,6 @@ public class BaseResponseAdvice implements ResponseBodyAdvice<Object> {
         if(body instanceof String){
             return JSONObject.toJSONString(ResultData.ok(body));
         }
-        if(body instanceof Page){
-            Page page = (Page) body;
-            return ResultData.ok(new PageInfo(page.getCurrent(), page.getSize(), page.getTotal(), page.getRecords()));
-        }
         if (body instanceof ResultData) {
             return body;
         } else {

4dkankan-common-utils/src/main/java/com/fdkankan/common/response/Result.java

@@ -1,4 +1,4 @@
-package com.fdkankan.common.response;
+package com.fdkankan.web.response;
 
 import java.io.Serializable;
 import lombok.AllArgsConstructor;

4dkankan-common-utils/src/main/java/com/fdkankan/common/response/ResultData.java

@@ -1,4 +1,4 @@
-package com.fdkankan.common.response;
+package com.fdkankan.web.response;
 
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
@@ -44,10 +44,6 @@ public class ResultData<T> implements Serializable {
         return base(ServerCode.SUCCESS.code(), msg, data,true);
     }
 
-    public static ResultData ok(int page,int pageSize,int total,Object data){
-        return  ok(new PageInfo(page, pageSize, total, data));
-    }
-
     public static ResultData error(int code, String msg) {
         return error(code, msg, null); }
     public static ResultData error(int code, String msg, Object data) {

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/BASE64DecodedMultipartFile.java

@@ -1,4 +1,4 @@
-package com.fdkankan.common.util;
+package com.fdkankan.web.util;
 
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/FileUpload.java

@@ -1,5 +1,6 @@
-package com.fdkankan.common.util;
+package com.fdkankan.web.util;
 
+import cn.hutool.core.io.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -41,16 +42,8 @@ public class FileUpload {
 	 * @param realName
 	 * @throws IOException
 	 */
-	private static String copyFile(InputStream in, String dir, String realName)
-			throws IOException {
-		File file = new File(dir, realName);
-		if (!file.exists()) {
-			if (!file.getParentFile().exists()) {
-				file.getParentFile().mkdirs();
-			}
-			file.createNewFile();
-		}
-        org.apache.commons.io.FileUtils.copyInputStreamToFile(in, file);
+	private static String copyFile(InputStream in, String dir, String realName){
+		FileUtil.writeFromStream(in,dir);
 		return realName;
 	}
 

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/RSAEncrypt.java

@@ -1,7 +1,6 @@
-package com.fdkankan.common.util;
+package com.fdkankan.web.util;
 
 import org.apache.commons.codec.binary.Base64;
-import org.springframework.util.ResourceUtils;
 import sun.misc.BASE64Decoder;
 
 import javax.crypto.BadPaddingException;
@@ -80,27 +79,27 @@ public class RSAEncrypt {
      *
      * @throws Exception 加载公钥时产生的异常
      */
-    public static String loadPublicKeyByFile() throws Exception {
-        try {
-            BufferedReader br = new BufferedReader(new FileReader(ResourceUtils.getFile(PUBLIC_KEY)));
-            String readLine = null;
-            StringBuilder sb = new StringBuilder();
-            while ((readLine = br.readLine()) != null) {
-                if (readLine.charAt(0) == '-') {
-                    continue;
-                } else {
-                    sb.append(readLine);
-                    sb.append('\r');
-                }
-            }
-            br.close();
-            return sb.toString();
-        } catch (IOException e) {
-            throw new Exception("公钥数据流读取错误");
-        } catch (NullPointerException e) {
-            throw new Exception("公钥输入流为空");
-        }
-    }
+//    public static String loadPublicKeyByFile() throws Exception {
+//        try {
+//            BufferedReader br = new BufferedReader(new FileReader(ResourceUtils.getFile(PUBLIC_KEY)));
+//            String readLine = null;
+//            StringBuilder sb = new StringBuilder();
+//            while ((readLine = br.readLine()) != null) {
+//                if (readLine.charAt(0) == '-') {
+//                    continue;
+//                } else {
+//                    sb.append(readLine);
+//                    sb.append('\r');
+//                }
+//            }
+//            br.close();
+//            return sb.toString();
+//        } catch (IOException e) {
+//            throw new Exception("公钥数据流读取错误");
+//        } catch (NullPointerException e) {
+//            throw new Exception("公钥输入流为空");
+//        }
+//    }
 
     /**
      * 从文件中输入流中加载公钥

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/SpringUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.common.util;
+package com.fdkankan.web.util;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

4dkankan-common-utils/src/main/java/com/fdkankan/common/response/PageInfo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.common.response;
+package com.fdkankan.db.response;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AllArgsConstructor;

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/PageInfoUtils.java

@@ -1,4 +1,4 @@
-package com.fdkankan.common.util;
+package com.fdkankan.db.utils;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.LinkedList;

4dkankan-utils-rubber-sheeting/pom.xml

@@ -13,6 +13,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>5.3.13</version>
+        </dependency>
+        <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
             <version>3.0.0-SNAPSHOT</version>

pom.xml

@@ -24,6 +24,7 @@
         <module>4dkankan-utils-model</module>
         <module>4dkankan-utils-wechat</module>
         <module>4dkankan-utils-image</module>
+        <module>4dkankan-utils-sensitive-word</module>
     </modules>
 
     <groupId>com.fdkankan</groupId>