feat?: 使用JDK版本过低提示

NahidaLing · Apr 21, 2024 · f3d0bfc · f3d0bfc
1 parent 01f16b3
commit f3d0bfc
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/CozeProxy/build.gradle b/CozeProxy/build.gradle
@@ -10,8 +10,8 @@ build{
 }
 
 jar {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType(JavaExec).configureEach {

diff --git a/CozeProxy/src/main/java/catx/feitu/CozeProxy/utils/ConversationUtils.java b/CozeProxy/src/main/java/catx/feitu/CozeProxy/utils/ConversationUtils.java
@@ -47,7 +47,7 @@ public static String conversation2JsonString(ConversationData conversation) {
         return JSON.toJSONString(conversation.conversations);
     }
     public static ConversationData jsonString2Conversation(String jsonString) {
-        TypeReference<ConcurrentHashMap<String, String>> typeRef = new TypeReference<>() {};
+        TypeReference<ConcurrentHashMap<String, String>> typeRef = new TypeReference<ConcurrentHashMap<String, String>>() {};
 
         ConversationData data = new ConversationData();
         data.conversations = JSON.parseObject(jsonString, typeRef);

diff --git a/DiscordSelfBot/build.gradle b/DiscordSelfBot/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 jar {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType(JavaExec).configureEach {

diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ build{
 }
 
 jar {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
     manifest {
         attributes(
                 'Main-Class': 'catx.feitu.coze_discord_bridge.Main'

diff --git a/src/main/java/catx/feitu/coze_discord_bridge/Main.java b/src/main/java/catx/feitu/coze_discord_bridge/Main.java
@@ -22,6 +22,10 @@ public class Main {
     public static void main(String[] args) {
         AnsiConsole.systemInstall();
         try {
+         try {
+            if (JdkUtils.getJdkVersion() < 11) {
+                throw new Exception("当前JDK版本过低 推荐使用17或更高版本");
+            }
             ConfigManage.DefaultConfig();
 
             ConfigManage.ReadConfig();

diff --git a/src/main/java/catx/feitu/coze_discord_bridge/utils/JdkUtils.java b/src/main/java/catx/feitu/coze_discord_bridge/utils/JdkUtils.java
@@ -0,0 +1,16 @@
+package catx.feitu.coze_discord_bridge.utils;
+
+public class JdkUtils {
+    public static int getJdkVersion() {
+        String version = System.getProperty("java.version");
+
+        if (version.startsWith("1.")) {
+            version = version.substring(2, 3);
+        } else {
+            int dot = version.indexOf(".");
+            if (dot != -1) { version = version.substring(0, dot); }
+        }
+
+        return Integer.parseInt(version);
+    }
+}