diff --git a/src/main/java/com/cym/config/AppFilter.java b/src/main/java/com/cym/config/AppFilter.java
index b1ebdee2a0e585caf1c126174eaa3645787d1c64..7cedf5893fd4825fca42710bb1b700eadc0a3069 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 f8a2a781208f00458254fcb315537987f86dd303..26b9e21a9781ea9f642c8faab428793a8f9ee841 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/config/VersionConfig.java b/src/main/java/com/cym/config/VersionConfig.java
index cc7174cb001c3ae7be8f9ae69325546deb59b96c..107bce7b71c9e5ce2a95aca89b92e120cd95f260 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();
diff --git a/src/main/java/com/cym/controller/adminPage/AdminController.java b/src/main/java/com/cym/controller/adminPage/AdminController.java
index c8bca4422f29889fb1f5cec5b1324f1c5c241a20..5a98dbd9c88424ac3b07e247283f028dd8ca4fd2 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/ExportController.java b/src/main/java/com/cym/controller/adminPage/ExportController.java
index 7502051f0d0468e5ba4c355487a0bddc74df4659..e2e9e3f351bff061e8a549aa05243090bba6c728 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/controller/adminPage/WwwController.java b/src/main/java/com/cym/controller/adminPage/WwwController.java
index 39ad1075ea0907774976e04d276a90a83be9ef2c..e1b78a115ce7dde536f61f2b34104bd8d9701e26 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;
diff --git a/src/main/java/com/cym/service/ServerService.java b/src/main/java/com/cym/service/ServerService.java
index 1cea84f60b6f11cc71ca7f7275b4f02c6baf9e08..26b450cec4b2e77ea992c79490cef7b6907f7271 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<Location> 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();
 			}
 
@@ -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 0b6188ec1d0e4367cea072cc696480581c107c71..2804249f9333d9a0631abe778a81c16a2e50ead6 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<Object> list = new ArrayList<Object>();
 						while (true) {
 							String json = reader.readLine();
diff --git a/src/main/java/com/cym/sqlhelper/utils/SnowFlake.java b/src/main/java/com/cym/sqlhelper/utils/SnowFlake.java
index 35b8c18fca48b23f48eaac5001569a87468d741e..31fc18ee80ddb1d73b51ec77facbe4b108fc3633 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/sqlhelper/utils/SqlHelper.java b/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java
index 921d4b92c8a3fe447db58155d1fb81b716e419a7..752466cc7b10d283845879db20d9de1c9d5be2bc 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";
 		}
diff --git a/src/main/java/com/cym/utils/Crypt.java b/src/main/java/com/cym/utils/Crypt.java
index 17fa792adafaea545db92a7cd910ef5408f4531c..8effbd4501c2bbf86b59b42c52b16d05b3e38250 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);
 	}