From c0df867e0607d09e682c31dd9de2770becc4fa4f Mon Sep 17 00:00:00 2001 From: handy Date: Thu, 16 Nov 2023 11:35:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Integer=20=E5=BA=94=E8=AF=A5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8equals=E6=96=B9=E6=B3=95=E6=AF=94=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/service/ServerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cym/service/ServerService.java b/src/main/java/com/cym/service/ServerService.java index 1cea84f6..c04d72b3 100644 --- a/src/main/java/com/cym/service/ServerService.java +++ b/src/main/java/com/cym/service/ServerService.java @@ -122,7 +122,7 @@ public class ServerService { private String findLocationDescr(List locationOlds, Location locationNew) { for (Location location : locationOlds) { - if (location.getPath().equals(locationNew.getPath()) && location.getType() == locationNew.getType()) { + if (location.getPath().equals(locationNew.getPath()) && location.getType().equals(locationNew.getType())) { return location.getDescr(); } -- Gitee From fa8dee66a2a00116453d92672097b807637efd14 Mon Sep 17 00:00:00 2001 From: handy Date: Thu, 16 Nov 2023 11:40:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Charset.forName("utf-8")=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAStandardCharsets.UTF=5F8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/config/AppFilter.java | 3 ++- src/main/java/com/cym/config/InitConfig.java | 3 ++- .../java/com/cym/controller/adminPage/ExportController.java | 5 +++-- src/main/java/com/cym/service/ServerService.java | 2 +- .../java/com/cym/sqlhelper/utils/ImportOrExportUtil.java | 3 ++- src/main/java/com/cym/sqlhelper/utils/SqlHelper.java | 6 +++--- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/cym/config/AppFilter.java b/src/main/java/com/cym/config/AppFilter.java index b1ebdee2..7cedf589 100644 --- a/src/main/java/com/cym/config/AppFilter.java +++ b/src/main/java/com/cym/config/AppFilter.java @@ -7,6 +7,7 @@ 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; import java.util.HashMap; @@ -187,7 +188,7 @@ public class AppFilter implements Filter { ctx.headerOrDefault("content-disposition", "attachment;filename=" + URLEncoder.encode(date + ".json", "UTF-8")); // 设置文件名 byte[] buffer = new byte[1024]; - BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(rs.getBytes(Charset.forName("UTF-8")))); + BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(rs.getBytes(StandardCharsets.UTF_8))); OutputStream os = ctx.outputStream(); int i = bis.read(buffer); while (i != -1) { diff --git a/src/main/java/com/cym/config/InitConfig.java b/src/main/java/com/cym/config/InitConfig.java index f8a2a781..26b9e21a 100644 --- a/src/main/java/com/cym/config/InitConfig.java +++ b/src/main/java/com/cym/config/InitConfig.java @@ -4,6 +4,7 @@ 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; @@ -218,7 +219,7 @@ public class InitConfig { private void showLogo() throws IOException { ClassPathResource resource = new ClassPathResource("banner.txt"); - BufferedReader reader = resource.getReader(Charset.forName("utf-8")); + BufferedReader reader = resource.getReader(StandardCharsets.UTF_8); String str = null; StringBuilder stringBuilder = new StringBuilder(); // 使用readLine() 比较方便的读取一行 diff --git a/src/main/java/com/cym/controller/adminPage/ExportController.java b/src/main/java/com/cym/controller/adminPage/ExportController.java index 7502051f..e2e9e3f3 100644 --- a/src/main/java/com/cym/controller/adminPage/ExportController.java +++ b/src/main/java/com/cym/controller/adminPage/ExportController.java @@ -6,6 +6,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Date; import org.noear.solon.annotation.Controller; @@ -58,7 +59,7 @@ public class ExportController extends BaseController { String json = JSONUtil.toJsonPrettyStr(asycPack); String date = DateUtil.format(new Date(), "yyyy-MM-dd_HH-mm-ss"); - DownloadedFile downloadedFile = new DownloadedFile("application/octet-stream", new ByteArrayInputStream(json.getBytes(Charset.forName("UTF-8"))), date + ".json"); + DownloadedFile downloadedFile = new DownloadedFile("application/octet-stream", new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)), date + ".json"); return downloadedFile; } @@ -68,7 +69,7 @@ public class ExportController extends BaseController { File tempFile = new File(homeConfig.home + "temp" + File.separator + file.getName()); FileUtil.mkdir(tempFile.getParentFile()); file.transferTo(tempFile); - String json = FileUtil.readString(tempFile, Charset.forName("UTF-8")); + String json = FileUtil.readString(tempFile, StandardCharsets.UTF_8); tempFile.delete(); AsycPack asycPack = JSONUtil.toBean(json, AsycPack.class); diff --git a/src/main/java/com/cym/service/ServerService.java b/src/main/java/com/cym/service/ServerService.java index c04d72b3..26b450ce 100644 --- a/src/main/java/com/cym/service/ServerService.java +++ b/src/main/java/com/cym/service/ServerService.java @@ -294,7 +294,7 @@ public class ServerService { rs.add(str); } - String initNginxPath = FileUtil.getTmpDirPath() + UUID.randomUUID().toString(); + String initNginxPath = FileUtil.getTmpDirPath() + UUID.randomUUID(); FileUtil.writeLines(rs, initNginxPath, CharsetUtil.CHARSET_UTF_8); return initNginxPath; } diff --git a/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java b/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java index 0b6188ec..2804249f 100644 --- a/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java +++ b/src/main/java/com/cym/sqlhelper/utils/ImportOrExportUtil.java @@ -3,6 +3,7 @@ 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; @@ -98,7 +99,7 @@ public class ImportOrExportUtil { if (file.exists()) { sqlHelper.deleteByQuery(new ConditionAndWrapper(), clazz); - reader = FileUtil.getReader(file, Charset.forName("UTF-8")); + reader = FileUtil.getReader(file, StandardCharsets.UTF_8); List list = new ArrayList(); while (true) { String json = reader.readLine(); diff --git a/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java b/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java index 921d4b92..752466cc 100644 --- a/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java +++ b/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java @@ -421,7 +421,7 @@ public class SqlHelper extends SqlUtils { sql += " WHERE " + conditionWrapper.build(values); } if (sort != null) { - sql += " " + sort.toString(); + sql += " " + sort; } else { sql += " ORDER BY id DESC"; } @@ -502,7 +502,7 @@ public class SqlHelper extends SqlUtils { sql += " WHERE " + conditionWrapper.build(values); } if (sort != null) { - sql += " " + sort.toString(); + sql += " " + sort; } else { sql += " ORDER BY id DESC"; } @@ -553,7 +553,7 @@ public class SqlHelper extends SqlUtils { sql += " WHERE " + conditionWrapper.build(values); } if (sort != null) { - sql += " " + sort.toString(); + sql += " " + sort; } else { sql += " ORDER BY id DESC"; } -- Gitee From 627ce9f299e050de2ddca651a2895fbad4a420ca Mon Sep 17 00:00:00 2001 From: handy Date: Thu, 16 Nov 2023 11:40:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=8A=9B=E5=87=BAIOExcep?= =?UTF-8?q?tion=20=E6=97=A0=E9=9C=80=E9=87=8D=E5=A4=8D=E6=8A=9B=E5=87=BAFi?= =?UTF-8?q?leNotFoundException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/config/VersionConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cym/config/VersionConfig.java b/src/main/java/com/cym/config/VersionConfig.java index cc7174cb..107bce7b 100644 --- a/src/main/java/com/cym/config/VersionConfig.java +++ b/src/main/java/com/cym/config/VersionConfig.java @@ -57,7 +57,7 @@ public class VersionConfig { } } - public String getFromPom() throws FileNotFoundException, IOException, XmlPullParserException { + public String getFromPom() throws IOException, XmlPullParserException { // 查看jar包里面pom.properties版本号 String jarPath = VersionConfig.class.getProtectionDomain().getCodeSource().getLocation().getFile(); -- Gitee From 895d51265313d644787d6f6f1c4cbbb318ba4267 Mon Sep 17 00:00:00 2001 From: handy Date: Thu, 16 Nov 2023 11:41:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A9=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cym/controller/adminPage/AdminController.java | 2 +- src/main/java/com/cym/controller/adminPage/WwwController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cym/controller/adminPage/AdminController.java b/src/main/java/com/cym/controller/adminPage/AdminController.java index c8bca442..5a98dbd9 100644 --- a/src/main/java/com/cym/controller/adminPage/AdminController.java +++ b/src/main/java/com/cym/controller/adminPage/AdminController.java @@ -157,7 +157,7 @@ public class AdminController extends BaseController { @Mapping(value = "qr") public void getqcode(String url, Integer w, Integer h) throws IOException { - if (url != null && !"".equals(url)) { + if (StrUtil.isNotBlank(url)) { if (w == null) { w = 300; diff --git a/src/main/java/com/cym/controller/adminPage/WwwController.java b/src/main/java/com/cym/controller/adminPage/WwwController.java index 39ad1075..e1b78a11 100644 --- a/src/main/java/com/cym/controller/adminPage/WwwController.java +++ b/src/main/java/com/cym/controller/adminPage/WwwController.java @@ -3,6 +3,7 @@ package com.cym.controller.adminPage; import java.net.URL; import java.nio.charset.Charset; +import cn.hutool.core.util.StrUtil; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Mapping; @@ -86,7 +87,7 @@ public class WwwController extends BaseController { strPackageName = getClass().getPackage().getName(); } String strClassFileName = ""; - if (!"".equals(strPackageName)) { + if (StrUtil.isNotBlank(strPackageName)) { strClassFileName = strClassName.substring(strPackageName.length() + 1, strClassName.length()); } else { strClassFileName = strClassName; -- Gitee From ef931403bcb4a05b77d6887b0c52269b75ad7268 Mon Sep 17 00:00:00 2001 From: handy Date: Thu, 16 Nov 2023 11:45:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A0=E6=84=8F=E4=B9=89=E7=9A=84?= =?UTF-8?q?=E6=8C=89=E4=BD=8D=E8=A1=A8=E8=BE=BE=E5=BC=8F=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/sqlhelper/utils/SnowFlake.java | 6 +++--- src/main/java/com/cym/utils/Crypt.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cym/sqlhelper/utils/SnowFlake.java b/src/main/java/com/cym/sqlhelper/utils/SnowFlake.java index 35b8c18f..31fc18ee 100644 --- a/src/main/java/com/cym/sqlhelper/utils/SnowFlake.java +++ b/src/main/java/com/cym/sqlhelper/utils/SnowFlake.java @@ -9,9 +9,9 @@ public class SnowFlake { private final static long DATA_CENTER_BIT = 5;//数据中心占用的位数 //每一部分的最大值 - private final static long MAX_DATA_CENTER_NUM = -1L ^ (-1L << DATA_CENTER_BIT); - private final static long MAX_MACHINE_NUM = -1L ^ (-1L << MACHINE_BIT); - private final static long MAX_SEQUENCE = -1L ^ (-1L << SEQUENCE_BIT); + private final static long MAX_DATA_CENTER_NUM = ~(-1L << DATA_CENTER_BIT); + private final static long MAX_MACHINE_NUM = ~(-1L << MACHINE_BIT); + private final static long MAX_SEQUENCE = ~(-1L << SEQUENCE_BIT); //每一部分向左的位移 private final static long MACHINE_LEFT = SEQUENCE_BIT; diff --git a/src/main/java/com/cym/utils/Crypt.java b/src/main/java/com/cym/utils/Crypt.java index 17fa792a..8effbd45 100644 --- a/src/main/java/com/cym/utils/Crypt.java +++ b/src/main/java/com/cym/utils/Crypt.java @@ -239,11 +239,11 @@ public class Crypt { t = skb[4][(d) & 0x3f] | skb[5][((d >>> 7) & 0x03) | ((d >>> 8) & 0x3c)] | skb[6][(d >>> 15) & 0x3f] | skb[7][((d >>> 21) & 0x0f) | ((d >>> 22) & 0x30)]; - schedule[j++] = ((t << 16) | (s & 0x0000ffff)) & 0xffffffff; + schedule[j++] = ((t << 16) | (s & 0x0000ffff)); s = ((s >>> 16) | (t & 0xffff0000)); s = (s << 4) | (s >>> 28); - schedule[j++] = s & 0xffffffff; + schedule[j++] = s; } return (schedule); } -- Gitee