From 1df671b3d92ca87b67a84d7775d54d39bd314653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 9 May 2023 12:35:05 +0800
Subject: [PATCH] 'commit'

---
 .../FengHuang/Exam/Controller/ExamController.java     |  7 ++-----
 .../java/com/dsideal/FengHuang/Util/PathUtil.java     |  8 ++++++++
 target/classes/ExcelExportTemplate/exam.json          | 11 +++++------
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/com/dsideal/FengHuang/Util/PathUtil.java

diff --git a/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java b/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
index 08e3f73..930e6a0 100644
--- a/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
+++ b/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dsideal.FengHuang.Exam.Model.ExamModel;
 import com.dsideal.FengHuang.Interceptor.EmptyInterface;
 import com.dsideal.FengHuang.Interceptor.IsNumericInterface;
-import com.dsideal.FengHuang.Util.CommonUtil;
-import com.dsideal.FengHuang.Util.CookieUtil;
-import com.dsideal.FengHuang.Util.ExcelCommonUtil;
-import com.dsideal.FengHuang.Util.FileUtil;
+import com.dsideal.FengHuang.Util.*;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
@@ -205,7 +202,7 @@ public class ExamController extends Controller {
     public void exportExcel() {
         Page<Record> list = em.getPageSummary(1, 10000);
         //模板文件
-        String excelPath = PathKit.getRootClassPath() + PropKit.get("excelExportTemplatePathSuffix").replace("\\", "/");
+        String excelPath = PathUtil.getRootClassPath() + PropKit.get("excelExportTemplatePathSuffix").replace("\\", "/");
         String filePath = excelPath + "exam.json";
         //转成 json对象
         JSONObject jo = FileUtil.readJsonFile(filePath);
diff --git a/src/main/java/com/dsideal/FengHuang/Util/PathUtil.java b/src/main/java/com/dsideal/FengHuang/Util/PathUtil.java
new file mode 100644
index 0000000..b0a2e6c
--- /dev/null
+++ b/src/main/java/com/dsideal/FengHuang/Util/PathUtil.java
@@ -0,0 +1,8 @@
+package com.dsideal.FengHuang.Util;
+
+public class PathUtil {
+    public static String getRootClassPath() {
+        String path = Thread.currentThread().getContextClassLoader().getResource("").toString().replace("file:/", "");
+        return path.substring(0, path.length() - 1);
+    }
+}
diff --git a/target/classes/ExcelExportTemplate/exam.json b/target/classes/ExcelExportTemplate/exam.json
index 22fc605..5793061 100644
--- a/target/classes/ExcelExportTemplate/exam.json
+++ b/target/classes/ExcelExportTemplate/exam.json
@@ -25,6 +25,11 @@
       "list_column_name": "score",
       "width": 40
     },
+    {
+      "show_column_name": "用时",
+      "list_column_name": "ys",
+      "width": 40
+    },
     {
       "show_column_name": "开始时间",
       "list_column_name": "start_time",
@@ -35,11 +40,5 @@
       "list_column_name": "end_time",
       "width": 40
     }
-  ,
-    {
-      "show_column_name": "用时",
-      "list_column_name": "ys",
-      "width": 40
-    }
   ]
 }
\ No newline at end of file