From 7ff81035d46f7edb941aa13a14b3fdc9f289b704 Mon Sep 17 00:00:00 2001 From: handy Date: Fri, 17 Nov 2023 11:12:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=8E=E4=B8=8D?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E7=9A=84throws=E5=AD=90=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cym/controller/adminPage/ExportController.java | 2 +- .../java/com/cym/controller/adminPage/LogController.java | 2 +- .../com/cym/controller/adminPage/PasswordController.java | 2 +- .../java/com/cym/controller/adminPage/WwwController.java | 2 +- .../java/com/cym/controller/api/ParamApiController.java | 2 +- src/main/java/com/cym/sqlhelper/utils/SqlUtils.java | 8 ++++---- src/main/java/com/cym/utils/Crypt.java | 2 +- src/test/java/com/cym/TestUtils.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/cym/controller/adminPage/ExportController.java b/src/main/java/com/cym/controller/adminPage/ExportController.java index e2e9e3f3..7afb98a6 100644 --- a/src/main/java/com/cym/controller/adminPage/ExportController.java +++ b/src/main/java/com/cym/controller/adminPage/ExportController.java @@ -49,7 +49,7 @@ public class ExportController extends BaseController { } @Mapping("dataExport") - public DownloadedFile dataExport(Context context) throws IOException { + public DownloadedFile dataExport(Context context) { AsycPack asycPack = confService.getAsycPack(new String[] { "all" }); // 导出证书 asycPack.setCertList(sqlHelper.findAll(Cert.class)); diff --git a/src/main/java/com/cym/controller/adminPage/LogController.java b/src/main/java/com/cym/controller/adminPage/LogController.java index 28fa6a59..3c5b2e61 100644 --- a/src/main/java/com/cym/controller/adminPage/LogController.java +++ b/src/main/java/com/cym/controller/adminPage/LogController.java @@ -104,7 +104,7 @@ public class LogController extends BaseController { } @Mapping("tailCmd") - public JsonResult tailCmd(String id, String guid) throws Exception { + public JsonResult tailCmd(String id, String guid) { Log log = sqlHelper.findById(id, Log.class); if (!FileUtil.exist(log.getPath())) { return renderSuccess(""); diff --git a/src/main/java/com/cym/controller/adminPage/PasswordController.java b/src/main/java/com/cym/controller/adminPage/PasswordController.java index e542053d..ea230291 100644 --- a/src/main/java/com/cym/controller/adminPage/PasswordController.java +++ b/src/main/java/com/cym/controller/adminPage/PasswordController.java @@ -35,7 +35,7 @@ public class PasswordController extends BaseController { } @Mapping("addOver") - public JsonResult addOver(Password password) throws IOException { + public JsonResult addOver(Password password){ if (StrUtil.isEmpty(password.getId())) { Long count = passwordService.getCountByName(password.getName()); diff --git a/src/main/java/com/cym/controller/adminPage/WwwController.java b/src/main/java/com/cym/controller/adminPage/WwwController.java index e1b78a11..50641618 100644 --- a/src/main/java/com/cym/controller/adminPage/WwwController.java +++ b/src/main/java/com/cym/controller/adminPage/WwwController.java @@ -79,7 +79,7 @@ public class WwwController extends BaseController { return renderSuccess(www); } - public String getClassPath() throws Exception { + public String getClassPath() { try { String strClassName = getClass().getName(); String strPackageName = ""; diff --git a/src/main/java/com/cym/controller/api/ParamApiController.java b/src/main/java/com/cym/controller/api/ParamApiController.java index 85bfb7bf..30643968 100644 --- a/src/main/java/com/cym/controller/api/ParamApiController.java +++ b/src/main/java/com/cym/controller/api/ParamApiController.java @@ -51,7 +51,7 @@ public class ParamApiController extends BaseController { * */ @Mapping("insertOrUpdate") - public JsonResult insertOrUpdate(Param param) throws IOException { + public JsonResult insertOrUpdate(Param param) { Integer count = 0; if (StrUtil.isNotEmpty(param.getLocationId())) { count++; diff --git a/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java b/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java index 2bba33f0..f0f7c5f1 100644 --- a/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java +++ b/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java @@ -38,7 +38,7 @@ public class SqlUtils { return sql; } - public void checkOrCreateTable(Class clazz) throws SQLException { + public void checkOrCreateTable(Class clazz) { String sql = "CREATE TABLE IF NOT EXISTS `" + StrUtil.toUnderlineCase(clazz.getSimpleName()) + "` (id VARCHAR(32) NOT NULL PRIMARY KEY)"; logQuery(formatSql(sql)); jdbcTemplate.execute(formatSql(sql)); @@ -75,7 +75,7 @@ public class SqlUtils { checkOrCreateIndex(clazz, new String[] { name }, unique, indexs); } - public void checkOrCreateIndex(Class clazz, String[] colums, boolean unique, List> indexs) throws SQLException { + public void checkOrCreateIndex(Class clazz, String[] colums, boolean unique, List> indexs) { List columList = new ArrayList(); for (String colum : colums) { columList.add(StrUtil.toUnderlineCase(colum)); @@ -105,7 +105,7 @@ public class SqlUtils { } - public void checkOrCreateColumn(Class clazz, String name, Set columns) throws SQLException { + public void checkOrCreateColumn(Class clazz, String name, Set columns) { if (!columns.contains(StrUtil.toUnderlineCase(name).toLowerCase())) { String sql = "ALTER TABLE `" + StrUtil.toUnderlineCase(clazz.getSimpleName()) + "` ADD COLUMN `" + StrUtil.toUnderlineCase(name) + "` LONGTEXT"; logQuery(formatSql(sql)); @@ -114,7 +114,7 @@ public class SqlUtils { } - public void updateDefaultValue(Class clazz, String column, String value) throws SQLException { + public void updateDefaultValue(Class clazz, String column, String value) { String sql = "SELECT COUNT(*) FROM `" + StrUtil.toUnderlineCase(clazz.getSimpleName()) + "` WHERE `" + StrUtil.toUnderlineCase(column) + "` IS NULL"; logQuery(formatSql(sql)); Long count = jdbcTemplate.queryForCount(formatSql(sql)); diff --git a/src/main/java/com/cym/utils/Crypt.java b/src/main/java/com/cym/utils/Crypt.java index 8effbd45..831c4f92 100644 --- a/src/main/java/com/cym/utils/Crypt.java +++ b/src/main/java/com/cym/utils/Crypt.java @@ -386,7 +386,7 @@ public class Crypt { /** * @param args the command line arguments */ - public static void main(String[] args) throws IOException { + public static void main(String[] args) { System.out.println(getString("name", "name")); diff --git a/src/test/java/com/cym/TestUtils.java b/src/test/java/com/cym/TestUtils.java index 07edcd3e..9b8722eb 100644 --- a/src/test/java/com/cym/TestUtils.java +++ b/src/test/java/com/cym/TestUtils.java @@ -19,7 +19,7 @@ import cn.hutool.core.util.RuntimeUtil; public class TestUtils extends HttpTester { @Test @Ignore - public void test() throws Exception { + public void test() { StringBuilder pass = new StringBuilder(1000); for (int i = 0; i < 2000000; i++) { -- Gitee From 98adc242898c0b2020af80292b09c0499725ac04 Mon Sep 17 00:00:00 2001 From: handy Date: Fri, 17 Nov 2023 11:13:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B2=A1=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E8=A3=85=E7=AE=B1=E5=B8=A6=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E9=A2=9D=E5=A4=96=E5=BC=80=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/config/AppFilter.java | 2 +- .../java/com/cym/controller/adminPage/MonitorController.java | 4 ++-- src/main/java/com/cym/controller/api/ParamApiController.java | 2 +- src/main/java/com/cym/sqlhelper/utils/SqlUtils.java | 2 +- src/main/java/com/cym/utils/AuthUtils.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cym/config/AppFilter.java b/src/main/java/com/cym/config/AppFilter.java index 7cedf589..7ca10558 100644 --- a/src/main/java/com/cym/config/AppFilter.java +++ b/src/main/java/com/cym/config/AppFilter.java @@ -138,7 +138,7 @@ public class AppFilter implements Filter { } String creditKey = ctx.param("creditKey"); - Boolean isCredit = creditService.check(creditKey); + boolean isCredit = creditService.check(creditKey); Boolean isLogin = (Boolean) ctx.session("isLogin"); if (!((isLogin != null && isLogin) || isCredit)) { diff --git a/src/main/java/com/cym/controller/adminPage/MonitorController.java b/src/main/java/com/cym/controller/adminPage/MonitorController.java index 2ef7a3e3..9bf3abb2 100644 --- a/src/main/java/com/cym/controller/adminPage/MonitorController.java +++ b/src/main/java/com/cym/controller/adminPage/MonitorController.java @@ -44,8 +44,8 @@ public class MonitorController extends BaseController { modelAndView.put("nginxExe", nginxExe); modelAndView.put("nginxPath", nginxPath); - Boolean isInit = StrUtil.isNotEmpty(nginxExe); - modelAndView.put("isInit", isInit.toString()); + boolean isInit = StrUtil.isNotEmpty(nginxExe); + modelAndView.put("isInit", Boolean.toString(isInit)); modelAndView.view("/adminPage/monitor/index.html"); return modelAndView; diff --git a/src/main/java/com/cym/controller/api/ParamApiController.java b/src/main/java/com/cym/controller/api/ParamApiController.java index 30643968..d56f4988 100644 --- a/src/main/java/com/cym/controller/api/ParamApiController.java +++ b/src/main/java/com/cym/controller/api/ParamApiController.java @@ -52,7 +52,7 @@ public class ParamApiController extends BaseController { */ @Mapping("insertOrUpdate") public JsonResult insertOrUpdate(Param param) { - Integer count = 0; + int count = 0; if (StrUtil.isNotEmpty(param.getLocationId())) { count++; } diff --git a/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java b/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java index f0f7c5f1..c05ab852 100644 --- a/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java +++ b/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java @@ -82,7 +82,7 @@ public class SqlUtils { } String name = StrUtil.join("&", columList) + "@" + StrUtil.toUnderlineCase(clazz.getSimpleName()); - Boolean hasIndex = false; + boolean hasIndex = false; for (Map map : indexs) { if (StrUtil.toUnderlineCase(name).equalsIgnoreCase((String) map.get("name")) || StrUtil.toUnderlineCase(name).equalsIgnoreCase((String) map.get("Key_name"))) { hasIndex = true; diff --git a/src/main/java/com/cym/utils/AuthUtils.java b/src/main/java/com/cym/utils/AuthUtils.java index c2ed745d..aa8566a7 100644 --- a/src/main/java/com/cym/utils/AuthUtils.java +++ b/src/main/java/com/cym/utils/AuthUtils.java @@ -18,7 +18,7 @@ public class AuthUtils { public Boolean testKey(String key, String code) { try { - Integer value = Integer.parseInt(code); + int value = Integer.parseInt(code); // 用户登录时使用 // 根据用户密钥和用户输入的密码，验证是否一致。（近3个密码都有效：前一个，当前，下一个） -- Gitee From d1c7ba697d2943efc2ab161e57a2a96d4a5c0d29 Mon Sep 17 00:00:00 2001 From: handy Date: Fri, 17 Nov 2023 11:18:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=20'Fil?= =?UTF-8?q?es.newInputStream()'=20=E6=9E=84=E5=BB=BA=20'InputStream'=20?= =?UTF-8?q?=E6=9D=A5=E8=8E=B7=E5=BE=97=E6=9B=B4=E5=A5=BD=E7=9A=84=E7=81=B5?= =?UTF-8?q?=E6=B4=BB=E6=80=A7=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cym/controller/adminPage/CertController.java | 4 +++- .../java/com/cym/controller/adminPage/ExportController.java | 5 +++-- .../java/com/cym/controller/adminPage/LogController.java | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java index 5b45dda8..e20ad932 100644 --- a/src/main/java/com/cym/controller/adminPage/CertController.java +++ b/src/main/java/com/cym/controller/adminPage/CertController.java @@ -3,6 +3,8 @@ package com.cym.controller.adminPage; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; @@ -372,7 +374,7 @@ public class CertController extends BaseController { ZipUtil.zip(dir); FileUtil.del(dir); - DownloadedFile downloadedFile = new DownloadedFile("application/octet-stream", new FileInputStream(dir + ".zip"), "cert.zip"); + DownloadedFile downloadedFile = new DownloadedFile("application/octet-stream", Files.newInputStream(Paths.get(dir + ".zip")), "cert.zip"); return downloadedFile; } diff --git a/src/main/java/com/cym/controller/adminPage/ExportController.java b/src/main/java/com/cym/controller/adminPage/ExportController.java index 7afb98a6..71ab00d2 100644 --- a/src/main/java/com/cym/controller/adminPage/ExportController.java +++ b/src/main/java/com/cym/controller/adminPage/ExportController.java @@ -7,6 +7,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.Date; import org.noear.solon.annotation.Controller; @@ -91,10 +92,10 @@ public class ExportController extends BaseController { } @Mapping("logExport") - public DownloadedFile logExport(Context context) throws FileNotFoundException { + public DownloadedFile logExport(Context context) throws IOException { File file = new File(homeConfig.home + "log/nginxWebUI.log"); if (file.exists()) { - DownloadedFile downloadedFile = new DownloadedFile("application/octet-stream", new FileInputStream(file), file.getName()); + DownloadedFile downloadedFile = new DownloadedFile("application/octet-stream", Files.newInputStream(file.toPath()), file.getName()); return downloadedFile; } diff --git a/src/main/java/com/cym/controller/adminPage/LogController.java b/src/main/java/com/cym/controller/adminPage/LogController.java index 3c5b2e61..06bca2e2 100644 --- a/src/main/java/com/cym/controller/adminPage/LogController.java +++ b/src/main/java/com/cym/controller/adminPage/LogController.java @@ -3,7 +3,9 @@ package com.cym.controller.adminPage; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Inject; @@ -90,7 +92,7 @@ public class LogController extends BaseController { } @Mapping("down") - public void down(ModelAndView modelAndView, String id) throws FileNotFoundException { + public void down(ModelAndView modelAndView, String id) throws IOException { Log log = sqlHelper.findById(id, Log.class); File file = new File(log.getPath()); @@ -99,7 +101,7 @@ public class LogController extends BaseController { String headerValue = "attachment; filename=" + URLUtil.encode(file.getName()); Context.current().header(headerKey, headerValue); - InputStream inputStream = new FileInputStream(file); + InputStream inputStream = Files.newInputStream(file.toPath()); Context.current().output(inputStream); } -- Gitee From 7778e1fb72af37b2e87cfd6e35b4f43ef32cb450 Mon Sep 17 00:00:00 2001 From: handy Date: Fri, 17 Nov 2023 11:20:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?StringBuilder+=E4=BF=AE=E6=94=B9=E4=B8=BAap?= =?UTF-8?q?pend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/config/InitConfig.java | 4 ++-- .../java/com/cym/controller/adminPage/RemoteController.java | 4 ++-- src/main/java/com/cym/utils/TimeExeUtils.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cym/config/InitConfig.java b/src/main/java/com/cym/config/InitConfig.java index 26b9e21a..1d98bce7 100644 --- a/src/main/java/com/cym/config/InitConfig.java +++ b/src/main/java/com/cym/config/InitConfig.java @@ -224,11 +224,11 @@ public class InitConfig { StringBuilder stringBuilder = new StringBuilder(); // 使用readLine() 比较方便的读取一行 while (null != (str = reader.readLine())) { - stringBuilder.append(str + "\n"); + stringBuilder.append(str).append("\n"); } reader.close();// 关闭流 - stringBuilder.append("nginxWebUI " + versionConfig.currentVersion + "\n"); + stringBuilder.append("nginxWebUI ").append(versionConfig.currentVersion).append("\n"); logger.info(stringBuilder.toString()); diff --git a/src/main/java/com/cym/controller/adminPage/RemoteController.java b/src/main/java/com/cym/controller/adminPage/RemoteController.java index 3d1cda55..ba89541d 100644 --- a/src/main/java/com/cym/controller/adminPage/RemoteController.java +++ b/src/main/java/com/cym/controller/adminPage/RemoteController.java @@ -307,10 +307,10 @@ public class RemoteController extends BaseController { if (cmd.contentEquals("update")) { jsonResult = renderError(m.get("remoteStr.notAllow")); } - rs.append("" + m.get("remoteStr.local") + "> "); + rs.append("").append(m.get("remoteStr.local")).append("> "); } else { Remote remote = sqlHelper.findById(id, Remote.class); - rs.append("").append(remote.getIp() + ":" + remote.getPort()).append("> "); + rs.append("").append(remote.getIp()).append(":").append(remote.getPort()).append("> "); if (cmd.contentEquals("check")) { cmd = "checkBase"; diff --git a/src/main/java/com/cym/utils/TimeExeUtils.java b/src/main/java/com/cym/utils/TimeExeUtils.java index 942b8197..164cede7 100644 --- a/src/main/java/com/cym/utils/TimeExeUtils.java +++ b/src/main/java/com/cym/utils/TimeExeUtils.java @@ -46,7 +46,7 @@ public class TimeExeUtils { while (true) { if (brStd.ready()) { line = brStd.readLine(); - sbStd.append(line + "\n"); + sbStd.append(line).append("\n"); logger.info(line); continue; } @@ -63,7 +63,7 @@ public class TimeExeUtils { if (System.currentTimeMillis() - start > timeout) { line = m.get("certStr.timeout"); - sbStd.append(line + "\n"); + sbStd.append(line).append("\n"); logger.info(line); break; } -- Gitee From c48502c26c07b29d37c1cc2236784007f8adfabb Mon Sep 17 00:00:00 2001 From: handy Date: Fri, 17 Nov 2023 11:25:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/NginxWebUI.java | 1 - src/main/java/com/cym/config/AppFilter.java | 1 - src/main/java/com/cym/config/HomeConfig.java | 1 - src/main/java/com/cym/config/InitConfig.java | 4 ---- src/main/java/com/cym/config/VersionConfig.java | 2 -- .../java/com/cym/controller/adminPage/AdminController.java | 1 - .../java/com/cym/controller/adminPage/CertController.java | 1 - .../java/com/cym/controller/adminPage/ConfController.java | 3 --- .../java/com/cym/controller/adminPage/ExportController.java | 4 ---- .../java/com/cym/controller/adminPage/HttpController.java | 2 -- .../java/com/cym/controller/adminPage/LogController.java | 3 --- .../java/com/cym/controller/adminPage/MainController.java | 6 ------ .../com/cym/controller/adminPage/PasswordController.java | 3 --- .../java/com/cym/controller/adminPage/StreamController.java | 2 -- .../com/cym/controller/adminPage/UpstreamController.java | 1 - .../java/com/cym/controller/adminPage/WwwController.java | 1 - .../java/com/cym/controller/api/ParamApiController.java | 1 - .../java/com/cym/controller/api/PasswordApiController.java | 2 +- src/main/java/com/cym/ext/MonitorInfo.java | 3 --- src/main/java/com/cym/ext/ServerExt.java | 1 - src/main/java/com/cym/service/CertService.java | 2 -- src/main/java/com/cym/service/ConfService.java | 1 - src/main/java/com/cym/service/StreamService.java | 1 - src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java | 1 - .../java/com/cym/sqlhelper/utils/ImportOrExportUtil.java | 4 ---- src/main/java/com/cym/sqlhelper/utils/SqlUtils.java | 2 +- src/main/java/com/cym/task/ScheduleTask.java | 6 ------ src/main/java/com/cym/utils/Crypt.java | 1 - src/main/java/com/cym/utils/NetWorkUtil.java | 1 - src/main/java/com/cym/utils/OshiUtils.java | 1 - 30 files changed, 2 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/cym/NginxWebUI.java b/src/main/java/com/cym/NginxWebUI.java index 43a6b92b..b48212e2 100644 --- a/src/main/java/com/cym/NginxWebUI.java +++ b/src/main/java/com/cym/NginxWebUI.java @@ -17,7 +17,6 @@ import com.cym.utils.SystemTool; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.RuntimeUtil; -import cn.hutool.core.util.StrUtil; @EnableScheduling @SolonMain diff --git a/src/main/java/com/cym/config/AppFilter.java b/src/main/java/com/cym/config/AppFilter.java index 7ca10558..005e0d50 100644 --- a/src/main/java/com/cym/config/AppFilter.java +++ b/src/main/java/com/cym/config/AppFilter.java @@ -6,7 +6,6 @@ import java.io.File; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/cym/config/HomeConfig.java b/src/main/java/com/cym/config/HomeConfig.java index 37762890..7d4faf62 100644 --- a/src/main/java/com/cym/config/HomeConfig.java +++ b/src/main/java/com/cym/config/HomeConfig.java @@ -5,7 +5,6 @@ import java.io.File; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; -import org.noear.solon.core.bean.InitializingBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/cym/config/InitConfig.java b/src/main/java/com/cym/config/InitConfig.java index 1d98bce7..696325d2 100644 --- a/src/main/java/com/cym/config/InitConfig.java +++ b/src/main/java/com/cym/config/InitConfig.java @@ -3,7 +3,6 @@ package com.cym.config; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -16,12 +15,10 @@ import org.slf4j.LoggerFactory; import com.cym.model.Admin; import com.cym.model.Basic; -import com.cym.model.Cert; import com.cym.model.Http; import com.cym.service.BasicService; import com.cym.service.ConfService; import com.cym.service.SettingService; -import com.cym.sqlhelper.utils.ConditionAndWrapper; import com.cym.sqlhelper.utils.SqlHelper; import com.cym.utils.EncodePassUtils; import com.cym.utils.MessageUtils; @@ -34,7 +31,6 @@ import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.RuntimeUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; -import cn.hutool.crypto.SecureUtil; @Component public class InitConfig { diff --git a/src/main/java/com/cym/config/VersionConfig.java b/src/main/java/com/cym/config/VersionConfig.java index 107bce7b..16f79ed9 100644 --- a/src/main/java/com/cym/config/VersionConfig.java +++ b/src/main/java/com/cym/config/VersionConfig.java @@ -1,7 +1,6 @@ package com.cym.config; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; @@ -13,7 +12,6 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Init; -import org.noear.solon.core.bean.InitializingBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/cym/controller/adminPage/AdminController.java b/src/main/java/com/cym/controller/adminPage/AdminController.java index 5a98dbd9..cf7e4225 100644 --- a/src/main/java/com/cym/controller/adminPage/AdminController.java +++ b/src/main/java/com/cym/controller/adminPage/AdminController.java @@ -25,7 +25,6 @@ import com.cym.service.SettingService; import com.cym.sqlhelper.bean.Page; import com.cym.utils.AuthUtils; import com.cym.utils.BaseController; -import com.cym.utils.EncodePassUtils; import com.cym.utils.JsonResult; import com.cym.utils.SendMailUtils; import com.google.zxing.BarcodeFormat; diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java index e20ad932..db579421 100644 --- a/src/main/java/com/cym/controller/adminPage/CertController.java +++ b/src/main/java/com/cym/controller/adminPage/CertController.java @@ -5,7 +5,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.ArrayList; diff --git a/src/main/java/com/cym/controller/adminPage/ConfController.java b/src/main/java/com/cym/controller/adminPage/ConfController.java index 980a8cc6..b92f2903 100644 --- a/src/main/java/com/cym/controller/adminPage/ConfController.java +++ b/src/main/java/com/cym/controller/adminPage/ConfController.java @@ -30,12 +30,9 @@ import com.cym.utils.ToolUtils; import cn.hutool.core.codec.Base64; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ClassPathResource; -import cn.hutool.core.net.URLDecoder; -import cn.hutool.core.net.URLEncodeUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.RuntimeUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.SecureUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; diff --git a/src/main/java/com/cym/controller/adminPage/ExportController.java b/src/main/java/com/cym/controller/adminPage/ExportController.java index 71ab00d2..52fb8240 100644 --- a/src/main/java/com/cym/controller/adminPage/ExportController.java +++ b/src/main/java/com/cym/controller/adminPage/ExportController.java @@ -2,10 +2,7 @@ package com.cym.controller.adminPage; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Date; @@ -23,7 +20,6 @@ import org.slf4j.LoggerFactory; import com.cym.ext.AsycPack; import com.cym.model.Cert; import com.cym.model.CertCode; -import com.cym.model.Stream; import com.cym.service.CertService; import com.cym.service.ConfService; import com.cym.sqlhelper.utils.ConditionAndWrapper; diff --git a/src/main/java/com/cym/controller/adminPage/HttpController.java b/src/main/java/com/cym/controller/adminPage/HttpController.java index 50a0c896..c85b2b33 100644 --- a/src/main/java/com/cym/controller/adminPage/HttpController.java +++ b/src/main/java/com/cym/controller/adminPage/HttpController.java @@ -7,9 +7,7 @@ import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Mapping; import org.noear.solon.core.handle.ModelAndView; -import com.cym.config.InitConfig; import com.cym.model.Http; -import com.cym.model.Server; import com.cym.service.HttpService; import com.cym.service.SettingService; import com.cym.utils.BaseController; diff --git a/src/main/java/com/cym/controller/adminPage/LogController.java b/src/main/java/com/cym/controller/adminPage/LogController.java index 06bca2e2..f1ccd973 100644 --- a/src/main/java/com/cym/controller/adminPage/LogController.java +++ b/src/main/java/com/cym/controller/adminPage/LogController.java @@ -1,8 +1,6 @@ package com.cym.controller.adminPage; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -27,7 +25,6 @@ import com.cym.utils.JsonResult; import com.cym.utils.SystemTool; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; @Controller diff --git a/src/main/java/com/cym/controller/adminPage/MainController.java b/src/main/java/com/cym/controller/adminPage/MainController.java index d918b7a3..11ff4644 100644 --- a/src/main/java/com/cym/controller/adminPage/MainController.java +++ b/src/main/java/com/cym/controller/adminPage/MainController.java @@ -2,30 +2,24 @@ package com.cym.controller.adminPage; import java.io.File; import java.io.IOException; -import java.util.HashMap; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Mapping; import org.noear.solon.core.handle.Context; -import org.noear.solon.core.handle.DownloadedFile; import org.noear.solon.core.handle.ModelAndView; import org.noear.solon.core.handle.UploadedFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cym.config.InitConfig; -import com.cym.model.Remote; import com.cym.service.SettingService; import com.cym.utils.BaseController; import com.cym.utils.JarUtil; import com.cym.utils.JsonResult; -import com.cym.utils.SystemTool; import com.cym.utils.UpdateUtils; import cn.hutool.core.io.FileUtil; import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; @Mapping("") @Controller diff --git a/src/main/java/com/cym/controller/adminPage/PasswordController.java b/src/main/java/com/cym/controller/adminPage/PasswordController.java index ea230291..d6de924d 100644 --- a/src/main/java/com/cym/controller/adminPage/PasswordController.java +++ b/src/main/java/com/cym/controller/adminPage/PasswordController.java @@ -1,13 +1,10 @@ package com.cym.controller.adminPage; -import java.io.IOException; - import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Mapping; import org.noear.solon.core.handle.ModelAndView; -import com.cym.config.InitConfig; import com.cym.model.Password; import com.cym.service.PasswordService; import com.cym.sqlhelper.bean.Page; diff --git a/src/main/java/com/cym/controller/adminPage/StreamController.java b/src/main/java/com/cym/controller/adminPage/StreamController.java index 3302e2fb..9fbd2225 100644 --- a/src/main/java/com/cym/controller/adminPage/StreamController.java +++ b/src/main/java/com/cym/controller/adminPage/StreamController.java @@ -8,7 +8,6 @@ import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Mapping; import org.noear.solon.core.handle.ModelAndView; -import com.cym.model.Stream; import com.cym.model.Stream; import com.cym.service.StreamService; import com.cym.utils.BaseController; @@ -16,7 +15,6 @@ import com.cym.utils.JsonResult; import com.cym.utils.SnowFlakeUtils; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; @Controller @Mapping("/adminPage/stream") diff --git a/src/main/java/com/cym/controller/adminPage/UpstreamController.java b/src/main/java/com/cym/controller/adminPage/UpstreamController.java index 8e0be073..5629ba31 100644 --- a/src/main/java/com/cym/controller/adminPage/UpstreamController.java +++ b/src/main/java/com/cym/controller/adminPage/UpstreamController.java @@ -11,7 +11,6 @@ import org.noear.solon.annotation.Mapping; import org.noear.solon.core.handle.ModelAndView; import com.cym.ext.UpstreamExt; -import com.cym.model.Server; import com.cym.model.Upstream; import com.cym.model.UpstreamServer; import com.cym.service.ParamService; diff --git a/src/main/java/com/cym/controller/adminPage/WwwController.java b/src/main/java/com/cym/controller/adminPage/WwwController.java index 50641618..c4cb488e 100644 --- a/src/main/java/com/cym/controller/adminPage/WwwController.java +++ b/src/main/java/com/cym/controller/adminPage/WwwController.java @@ -11,7 +11,6 @@ import org.noear.solon.core.handle.ModelAndView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cym.model.Server; import com.cym.model.Www; import com.cym.service.WwwService; import com.cym.sqlhelper.bean.Sort; diff --git a/src/main/java/com/cym/controller/api/ParamApiController.java b/src/main/java/com/cym/controller/api/ParamApiController.java index d56f4988..a66b48ae 100644 --- a/src/main/java/com/cym/controller/api/ParamApiController.java +++ b/src/main/java/com/cym/controller/api/ParamApiController.java @@ -1,6 +1,5 @@ package com.cym.controller.api; -import java.io.IOException; import java.util.List; import org.noear.solon.annotation.Controller; diff --git a/src/main/java/com/cym/controller/api/PasswordApiController.java b/src/main/java/com/cym/controller/api/PasswordApiController.java index 395435da..93476749 100644 --- a/src/main/java/com/cym/controller/api/PasswordApiController.java +++ b/src/main/java/com/cym/controller/api/PasswordApiController.java @@ -43,7 +43,7 @@ public class PasswordApiController extends BaseController { * */ @Mapping("insertOrUpdate") - public JsonResult insertOrUpdate(Password password) throws IOException { + public JsonResult insertOrUpdate(Password password){ return renderSuccess(passwordController.addOver(password)); } diff --git a/src/main/java/com/cym/ext/MonitorInfo.java b/src/main/java/com/cym/ext/MonitorInfo.java index 3c5af09e..b231ce3d 100644 --- a/src/main/java/com/cym/ext/MonitorInfo.java +++ b/src/main/java/com/cym/ext/MonitorInfo.java @@ -1,8 +1,5 @@ package com.cym.ext; -import java.util.List; -import java.util.Map; - /** * 监视信息的JavaBean类. * diff --git a/src/main/java/com/cym/ext/ServerExt.java b/src/main/java/com/cym/ext/ServerExt.java index 61bc37a0..d2ad2528 100644 --- a/src/main/java/com/cym/ext/ServerExt.java +++ b/src/main/java/com/cym/ext/ServerExt.java @@ -4,7 +4,6 @@ import java.util.List; import com.cym.model.Location; import com.cym.model.Server; -import com.cym.model.Upstream; public class ServerExt { Server server; diff --git a/src/main/java/com/cym/service/CertService.java b/src/main/java/com/cym/service/CertService.java index a3543a8e..05e39285 100644 --- a/src/main/java/com/cym/service/CertService.java +++ b/src/main/java/com/cym/service/CertService.java @@ -1,7 +1,6 @@ package com.cym.service; import java.io.File; -import java.io.IOException; import java.util.List; import org.noear.solon.annotation.Inject; @@ -10,7 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.cym.config.HomeConfig; -import com.cym.model.Admin; import com.cym.model.Cert; import com.cym.model.CertCode; import com.cym.sqlhelper.bean.Page; diff --git a/src/main/java/com/cym/service/ConfService.java b/src/main/java/com/cym/service/ConfService.java index 0cf52869..38e8040d 100644 --- a/src/main/java/com/cym/service/ConfService.java +++ b/src/main/java/com/cym/service/ConfService.java @@ -3,7 +3,6 @@ package com.cym.service; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/cym/service/StreamService.java b/src/main/java/com/cym/service/StreamService.java index cb04e3cf..19967ef3 100644 --- a/src/main/java/com/cym/service/StreamService.java +++ b/src/main/java/com/cym/service/StreamService.java @@ -5,7 +5,6 @@ import java.util.List; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; -import com.cym.model.Http; import com.cym.model.Param; import com.cym.model.Stream; import com.cym.sqlhelper.bean.Sort; diff --git a/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java b/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java index 0a135f4a..390c505b 100644 --- a/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java +++ b/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java @@ -9,7 +9,6 @@ import org.noear.solon.annotation.Inject; import com.cym.config.HomeConfig; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import org.noear.solon.core.bean.InitializingBean; @Component public class DataSourceEmbed { diff --git a/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java b/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java index 2804249f..0e5f518d 100644 --- a/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java +++ b/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java @@ -2,19 +2,15 @@ package com.cym.sqlhelper.utils; import java.io.BufferedReader; import java.io.File; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.sql.DataSource; - import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; import com.cym.sqlhelper.bean.Page; -import com.cym.sqlhelper.config.DataSourceEmbed; import com.cym.sqlhelper.config.Table; import cn.hutool.core.io.FileUtil; diff --git a/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java b/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java index c05ab852..786ec6f8 100644 --- a/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java +++ b/src/main/java/com/cym/sqlhelper/utils/SqlUtils.java @@ -71,7 +71,7 @@ public class SqlUtils { } } - public void checkOrCreateIndex(Class clazz, String name, boolean unique, List> indexs) throws SQLException { + public void checkOrCreateIndex(Class clazz, String name, boolean unique, List> indexs) { checkOrCreateIndex(clazz, new String[] { name }, unique, indexs); } diff --git a/src/main/java/com/cym/task/ScheduleTask.java b/src/main/java/com/cym/task/ScheduleTask.java index 0a805372..a22fdff8 100644 --- a/src/main/java/com/cym/task/ScheduleTask.java +++ b/src/main/java/com/cym/task/ScheduleTask.java @@ -1,7 +1,5 @@ package com.cym.task; -import java.io.File; -import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -21,7 +19,6 @@ import com.cym.controller.adminPage.CertController; import com.cym.controller.adminPage.ConfController; import com.cym.controller.adminPage.RemoteController; import com.cym.model.Cert; -import com.cym.model.Http; import com.cym.model.Remote; import com.cym.model.Upstream; import com.cym.model.UpstreamServer; @@ -36,12 +33,9 @@ import com.cym.utils.MessageUtils; import com.cym.utils.SendMailUtils; import com.cym.utils.TelnetUtils; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.TypeReference; import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.ZipUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; diff --git a/src/main/java/com/cym/utils/Crypt.java b/src/main/java/com/cym/utils/Crypt.java index 831c4f92..0ea2bd13 100644 --- a/src/main/java/com/cym/utils/Crypt.java +++ b/src/main/java/com/cym/utils/Crypt.java @@ -1,6 +1,5 @@ package com.cym.utils; -import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Random; diff --git a/src/main/java/com/cym/utils/NetWorkUtil.java b/src/main/java/com/cym/utils/NetWorkUtil.java index fd18a638..93b9afe5 100644 --- a/src/main/java/com/cym/utils/NetWorkUtil.java +++ b/src/main/java/com/cym/utils/NetWorkUtil.java @@ -12,7 +12,6 @@ import java.util.StringTokenizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cym.NginxWebUI; import com.cym.ext.NetworkInfo; import cn.hutool.core.date.DateUtil; diff --git a/src/main/java/com/cym/utils/OshiUtils.java b/src/main/java/com/cym/utils/OshiUtils.java index b7b302e4..a9d1f951 100644 --- a/src/main/java/com/cym/utils/OshiUtils.java +++ b/src/main/java/com/cym/utils/OshiUtils.java @@ -12,7 +12,6 @@ import com.cym.utils.oshi.MemoryDomain; import com.cym.utils.oshi.NetDomain; import com.cym.utils.oshi.ServerDomain; -import cn.hutool.core.net.Ipv4Util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; -- Gitee From 3e062512ee34a86fa89cb97a00d0d2b1ca3097e6 Mon Sep 17 00:00:00 2001 From: handy Date: Fri, 17 Nov 2023 11:26:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=84=8F?= =?UTF-8?q?=E4=B9=89=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cym/controller/adminPage/ServerController.java | 4 ++-- src/main/java/com/cym/controller/api/ServerApiController.java | 2 +- src/main/java/com/cym/utils/PwdCheckUtil.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cym/controller/adminPage/ServerController.java b/src/main/java/com/cym/controller/adminPage/ServerController.java index 16139699..800fb9fe 100644 --- a/src/main/java/com/cym/controller/adminPage/ServerController.java +++ b/src/main/java/com/cym/controller/adminPage/ServerController.java @@ -189,11 +189,11 @@ public class ServerController extends BaseController { List list = serverService.getLocationByServerId(id); for (Location location : list) { String json = paramService.getJsonByTypeId(location.getId(), "location"); - location.setLocationParamJson(json != null ? json : null); + location.setLocationParamJson(json); } serverExt.setLocationList(list); String json = paramService.getJsonByTypeId(server.getId(), "server"); - serverExt.setParamJson(json != null ? json : null); + serverExt.setParamJson(json); return renderSuccess(serverExt); } diff --git a/src/main/java/com/cym/controller/api/ServerApiController.java b/src/main/java/com/cym/controller/api/ServerApiController.java index 2decc61c..dc3ec93d 100644 --- a/src/main/java/com/cym/controller/api/ServerApiController.java +++ b/src/main/java/com/cym/controller/api/ServerApiController.java @@ -92,7 +92,7 @@ public class ServerApiController extends BaseController { List locationList = serverService.getLocationByServerId(serverId); for (Location location : locationList) { String json = paramService.getJsonByTypeId(location.getId(), "location"); - location.setLocationParamJson(json != null ? json : null); + location.setLocationParamJson(json); } return renderSuccess(locationList); } diff --git a/src/main/java/com/cym/utils/PwdCheckUtil.java b/src/main/java/com/cym/utils/PwdCheckUtil.java index 3feab7f7..87c9e2b3 100644 --- a/src/main/java/com/cym/utils/PwdCheckUtil.java +++ b/src/main/java/com/cym/utils/PwdCheckUtil.java @@ -39,12 +39,12 @@ public class PwdCheckUtil { public static boolean checkPasswordLength(String password, String minNum, String maxNum) { boolean flag =false; if (StrUtil.isBlank(maxNum)) { - minNum = StrUtil.isBlank(minNum) == true ? "0":minNum; + minNum = StrUtil.isBlank(minNum) ? "0":minNum; if (password.length() >= Integer.parseInt(minNum)) { flag = true; } } else { - minNum = StrUtil.isBlank(minNum) == true ? "0":minNum; + minNum = StrUtil.isBlank(minNum) ? "0":minNum; if (password.length() >= Integer.parseInt(minNum) && password.length() <= Integer.parseInt(maxNum)) { flag = true; -- Gitee