fix 优化 import

dromara · Jul 26, 2022 · 5725071 · 5725071
1 parent ef73048
commit 5725071
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 48 deletions.
diff --git a/modules/common/src/main/java/io/jpom/plugin/IPlugin.java b/modules/common/src/main/java/io/jpom/plugin/IPlugin.java
@@ -23,7 +23,6 @@
 package io.jpom.plugin;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ClassUtil;
 import com.alibaba.fastjson.JSONObject;
 

diff --git a/modules/common/src/main/java/io/jpom/plugin/PluginFactory.java b/modules/common/src/main/java/io/jpom/plugin/PluginFactory.java
@@ -27,7 +27,6 @@
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.JarClassLoader;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ClassLoaderUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.StrUtil;
@@ -47,8 +46,6 @@
 import java.net.URLClassLoader;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
 

diff --git a/modules/server/src/main/java/io/jpom/controller/build/BuildInfoTriggerController.java b/modules/server/src/main/java/io/jpom/controller/build/BuildInfoTriggerController.java
@@ -23,10 +23,7 @@
 package io.jpom.controller.build;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestAlgorithm;
-import cn.hutool.crypto.digest.Digester;
 import cn.jiangzeyin.common.JsonMessage;
 import io.jpom.common.BaseServerController;
 import io.jpom.common.ServerOpenApi;

diff --git a/modules/server/src/main/java/io/jpom/controller/build/RepositoryController.java b/modules/server/src/main/java/io/jpom/controller/build/RepositoryController.java
@@ -33,7 +33,6 @@
 import cn.hutool.db.Page;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.Header;
-import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.jiangzeyin.common.JsonMessage;

diff --git a/modules/server/src/main/java/io/jpom/controller/node/script/NodeScriptController.java b/modules/server/src/main/java/io/jpom/controller/node/script/NodeScriptController.java
@@ -37,7 +37,6 @@
 import io.jpom.model.data.NodeModel;
 import io.jpom.model.data.UserModel;
 import io.jpom.model.node.ScriptCacheModel;
-import io.jpom.model.script.ScriptModel;
 import io.jpom.permission.*;
 import io.jpom.service.node.script.NodeScriptExecuteLogServer;
 import io.jpom.service.node.script.NodeScriptServer;

diff --git a/modules/server/src/main/java/io/jpom/controller/openapi/BuildTriggerApiController.java b/modules/server/src/main/java/io/jpom/controller/openapi/BuildTriggerApiController.java
@@ -27,7 +27,6 @@
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.db.Entity;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.jiangzeyin.common.JsonMessage;
 import cn.jiangzeyin.common.validator.ValidatorItem;
@@ -38,16 +37,13 @@
 import io.jpom.common.BaseServerController;
 import io.jpom.common.ServerOpenApi;
 import io.jpom.common.interceptor.NotLogin;
-import io.jpom.controller.build.BuildInfoTriggerController;
 import io.jpom.model.BaseEnum;
 import io.jpom.model.data.BuildInfoModel;
 import io.jpom.model.data.UserModel;
 import io.jpom.model.enums.BuildStatus;
 import io.jpom.service.dblog.BuildInfoService;
 import io.jpom.service.user.TriggerTokenLogServer;
-import io.jpom.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
-import org.h2.util.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;

diff --git a/modules/server/src/main/java/io/jpom/controller/openapi/NodeScriptTriggerApiController.java b/modules/server/src/main/java/io/jpom/controller/openapi/NodeScriptTriggerApiController.java
@@ -28,20 +28,16 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.jpom.common.BaseJpomController;
-import io.jpom.common.BaseServerController;
 import io.jpom.common.ServerOpenApi;
 import io.jpom.common.forward.NodeForward;
 import io.jpom.common.forward.NodeUrl;
 import io.jpom.common.interceptor.NotLogin;
 import io.jpom.model.data.NodeModel;
 import io.jpom.model.data.UserModel;
 import io.jpom.model.node.ScriptCacheModel;
-import io.jpom.model.script.ScriptExecuteLogModel;
 import io.jpom.service.node.NodeService;
 import io.jpom.service.node.script.NodeScriptServer;
-import io.jpom.service.script.ScriptExecuteLogServer;
 import io.jpom.service.user.TriggerTokenLogServer;
-import io.jpom.socket.ScriptProcessBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;

diff --git a/...les/server/src/main/java/io/jpom/controller/openapi/ServerScriptTriggerApiController.java b/...les/server/src/main/java/io/jpom/controller/openapi/ServerScriptTriggerApiController.java
@@ -25,14 +25,12 @@
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.jiangzeyin.common.JsonMessage;
-import cn.jiangzeyin.common.spring.SpringUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.jpom.common.BaseJpomController;
 import io.jpom.common.BaseServerController;
 import io.jpom.common.ServerOpenApi;
 import io.jpom.common.interceptor.NotLogin;
-import io.jpom.model.data.CommandModel;
 import io.jpom.model.data.UserModel;
 import io.jpom.model.script.ScriptExecuteLogModel;
 import io.jpom.model.script.ScriptModel;

diff --git a/modules/server/src/main/java/io/jpom/controller/script/ScriptController.java b/modules/server/src/main/java/io/jpom/controller/script/ScriptController.java
@@ -35,7 +35,6 @@
 import io.jpom.common.forward.NodeUrl;
 import io.jpom.common.interceptor.BaseJpomInterceptor;
 import io.jpom.model.PageResultDto;
-import io.jpom.model.data.CommandModel;
 import io.jpom.model.data.NodeModel;
 import io.jpom.model.data.UserModel;
 import io.jpom.model.script.ScriptModel;

diff --git a/modules/server/src/main/java/io/jpom/controller/system/BuildConfigController.java b/modules/server/src/main/java/io/jpom/controller/system/BuildConfigController.java
@@ -23,15 +23,11 @@
 package io.jpom.controller.system;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.extra.validation.ValidationUtil;
 import cn.hutool.json.JSONObject;
 import cn.jiangzeyin.common.JsonMessage;
 import cn.jiangzeyin.common.validator.ValidatorItem;
-import io.jpom.DockerUtil;
 import io.jpom.common.BaseServerController;
 import io.jpom.permission.ClassFeature;
 import io.jpom.permission.Feature;
@@ -42,25 +38,13 @@
 import io.jpom.service.docker.DockerInfoService;
 import io.jpom.util.StringUtil;
 import lombok.Lombok;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

diff --git a/modules/server/src/main/java/io/jpom/service/script/ScriptServer.java b/modules/server/src/main/java/io/jpom/service/script/ScriptServer.java
@@ -41,7 +41,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author bwcx_jzy

diff --git a/modules/server/src/test/java/TestSe.java b/modules/server/src/test/java/TestSe.java
@@ -20,10 +20,10 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.digest.HMac;
 import cn.hutool.crypto.symmetric.AES;
 import cn.hutool.crypto.symmetric.DES;
 import org.junit.jupiter.api.Test;

diff --git a/modules/sub-plugin/docker-cli/src/main/java/io/jpom/DefaultDockerCheckPluginImpl.java b/modules/sub-plugin/docker-cli/src/main/java/io/jpom/DefaultDockerCheckPluginImpl.java
@@ -23,11 +23,9 @@
 package io.jpom;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.Resource;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.jiangzeyin.common.JsonMessage;
 import com.alibaba.fastjson.JSONObject;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.PingCmd;
@@ -44,22 +42,16 @@
 import io.jpom.plugin.IDefaultPlugin;
 import io.jpom.plugin.PluginConfig;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
 import org.springframework.util.Assert;
-import org.springframework.util.ResourceUtils;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
 import java.time.Duration;
 import java.util.*;
 import java.util.stream.Collectors;

diff --git a/modules/sub-plugin/docker-cli/src/main/java/io/jpom/DefaultDockerPluginImpl.java b/modules/sub-plugin/docker-cli/src/main/java/io/jpom/DefaultDockerPluginImpl.java
@@ -45,7 +45,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;

diff --git a/modules/sub-plugin/docker-cli/src/main/java/io/jpom/DockerUtil.java b/modules/sub-plugin/docker-cli/src/main/java/io/jpom/DockerUtil.java
@@ -43,7 +43,6 @@
 import org.springframework.util.ResourceUtils;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.time.Duration;