From 37a04afe53d538cdfa52d5de5f17f90b8389ef3e Mon Sep 17 00:00:00 2001 From: qmstyle Date: Sat, 22 Mar 2025 14:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=20=20,=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E6=97=A0=E6=A8=A1=E5=9D=97=E5=8C=96=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202025=E5=B9=B43=E6=9C=8822=E6=97=A514:51:33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 31 +++++++++++++------ .../online/exam/ui/api/ApiUtils.java | 9 +----- .../exam/ui/api/model/AnswerDataLoad.java | 6 ++-- .../exam/ui/api/model/OptionDataLoad.java | 6 ++-- .../exam/ui/api/model/PaperDataLoad.java | 6 ++-- .../exam/ui/api/model/PermissionDataLoad.java | 6 ++-- .../exam/ui/api/model/QuestionDataLoad.java | 6 ++-- .../ui/api/model/QuestionOptionDataLoad.java | 6 ++-- .../exam/ui/api/model/RoleDataLoad.java | 6 ++-- .../exam/ui/api/model/SubjectDataLoad.java | 6 ++-- .../exam/ui/api/model/UserDataLoad.java | 6 ++-- .../ui/components/DynamicTableComponent.java | 1 - .../exam/ui/components/ExamComponent.java | 6 ++-- .../PaperViewComponentCallBackImpl.java | 5 +-- .../online/exam/ui/utils/HttpUtils.java | 3 +- src/main/java/module-info.java | 7 +++-- 16 files changed, 60 insertions(+), 56 deletions(-) diff --git a/pom.xml b/pom.xml index 7265da2..97f7be4 100644 --- a/pom.xml +++ b/pom.xml @@ -41,19 +41,30 @@ cn.hutool - hutool-all - 5.8.22 - - - com.alibaba - fastjson - 1.2.83 + hutool-http + 5.8.29 + system + ${project.basedir}/libs/hutool-http-5.8.29.jar - Freedom-Mr - JavaFx-PaginationPicker - 0.0.2 + cn.hutool + hutool-core + 5.8.29 + system + ${project.basedir}/libs/hutool-core-5.8.29.jar + + + + com.alibaba.fastjson2 + fastjson2 + 2.0.48 + + + + org.casic.javafx.control + PaginationPicker + 0.0.3 diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/ApiUtils.java b/src/main/java/com/zhangmeng/online/exam/ui/api/ApiUtils.java index e93e108..38ff53a 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/ApiUtils.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/ApiUtils.java @@ -1,12 +1,5 @@ package com.zhangmeng.online.exam.ui.api; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - import com.zhangmeng.online.exam.ui.admin.IndexPage; import com.zhangmeng.online.exam.ui.api.form.RoleForm; import com.zhangmeng.online.exam.ui.api.form.UserForm; @@ -20,7 +13,7 @@ import javafx.beans.property.SimpleStringProperty; import javafx.scene.control.ContextMenu; import javafx.scene.control.MenuItem; import javafx.scene.control.TableView; - +import com.alibaba.fastjson2.*; import java.util.*; /** diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/AnswerDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/AnswerDataLoad.java index c30b897..db16610 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/AnswerDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/AnswerDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.api.form.UserForm; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/OptionDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/OptionDataLoad.java index 96d1bd7..8f21ecd 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/OptionDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/OptionDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.api.form.UserForm; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/PaperDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/PaperDataLoad.java index c614314..045f459 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/PaperDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/PaperDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.admin.IndexPage; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/PermissionDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/PermissionDataLoad.java index 303a258..984ccd0 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/PermissionDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/PermissionDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.utils.HttpUtils; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionDataLoad.java index d175ea5..e5d1aa7 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.utils.HttpUtils; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionOptionDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionOptionDataLoad.java index bcedb2c..fd59643 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionOptionDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/QuestionOptionDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.api.form.UserForm; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/RoleDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/RoleDataLoad.java index e5e8182..7448b25 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/RoleDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/RoleDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.utils.HttpUtils; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/SubjectDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/SubjectDataLoad.java index ecfc10c..74a4d86 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/SubjectDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/SubjectDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.api.form.UserForm; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/api/model/UserDataLoad.java b/src/main/java/com/zhangmeng/online/exam/ui/api/model/UserDataLoad.java index 20d9443..d5d86c2 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/api/model/UserDataLoad.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/api/model/UserDataLoad.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.api.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.api.form.UserForm; import com.zhangmeng.online.exam.ui.utils.AlertUtils; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/components/DynamicTableComponent.java b/src/main/java/com/zhangmeng/online/exam/ui/components/DynamicTableComponent.java index e585a09..41c7d8a 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/components/DynamicTableComponent.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/components/DynamicTableComponent.java @@ -23,7 +23,6 @@ import org.casic.javafx.control.PaginationPicker; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import static cn.hutool.poi.word.TableUtil.createTable; /** * 动态表格 diff --git a/src/main/java/com/zhangmeng/online/exam/ui/components/ExamComponent.java b/src/main/java/com/zhangmeng/online/exam/ui/components/ExamComponent.java index ce0e8ec..8f9623e 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/components/ExamComponent.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/components/ExamComponent.java @@ -1,8 +1,8 @@ package com.zhangmeng.online.exam.ui.components; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.utils.HttpUtils; import javafx.beans.property.SimpleIntegerProperty; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/components/callBack/PaperViewComponentCallBackImpl.java b/src/main/java/com/zhangmeng/online/exam/ui/components/callBack/PaperViewComponentCallBackImpl.java index 491b872..38a9c54 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/components/callBack/PaperViewComponentCallBackImpl.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/components/callBack/PaperViewComponentCallBackImpl.java @@ -1,7 +1,8 @@ package com.zhangmeng.online.exam.ui.components.callBack; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.zhangmeng.online.exam.ui.api.ApiUtils; import com.zhangmeng.online.exam.ui.api.DataLoad; import com.zhangmeng.online.exam.ui.api.model.PaperDataLoad; diff --git a/src/main/java/com/zhangmeng/online/exam/ui/utils/HttpUtils.java b/src/main/java/com/zhangmeng/online/exam/ui/utils/HttpUtils.java index 962bcfb..eac0026 100644 --- a/src/main/java/com/zhangmeng/online/exam/ui/utils/HttpUtils.java +++ b/src/main/java/com/zhangmeng/online/exam/ui/utils/HttpUtils.java @@ -3,8 +3,7 @@ package com.zhangmeng.online.exam.ui.utils; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import java.io.File; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 77171cc..a03a40a 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,10 +1,11 @@ module com.zhangmeng.onlineexamui { requires javafx.controls; requires javafx.fxml; - requires cn.hutool; + requires cn.hutool.http; + requires cn.hutool.core; requires java.sql; - requires fastjson; - requires JavaFx.PaginationPicker; + requires com.alibaba.fastjson2; + requires PaginationPicker; opens com.zhangmeng.online.exam.ui to javafx.fxml;