Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -36,6 +36,10 @@ import java.util.*;
 
 public class CollectController extends Controller {
     CollectModel cm = new CollectModel();
+    String basePath = CommonUtil.WebRoot + File.separator + "Excel";
+
+    public CollectController() throws URISyntaxException {
+    }
 
     /********以下为EXCEL模板上传管理功能******************************************************
      /**
@@ -71,7 +75,6 @@ public class CollectController extends Controller {
             renderJson(map);
             return;
         }
-        String basePath = CommonUtil.getClassPath() + "/Excel";
         String upload_excel_filename = UUID.randomUUID().toString().toLowerCase() + ".xlsx";
         String templateXls = basePath + "/" + upload_excel_filename;
         //判断目录是不是存在
@@ -266,7 +269,7 @@ public class CollectController extends Controller {
         Record jobRecord = cm.getJob(job_id);
 
         String upload_excel_filename = jobRecord.getStr("upload_excel_filename");//原始模板文件
-        String basePath = CommonUtil.getClassPath() + "/Excel";
+
         String upload_excel_filename_finish = UUID.randomUUID().toString().toLowerCase() + ".xlsx";//系统中可以提供下载的模板文件
         FileUtil.copy(basePath + File.separator + upload_excel_filename, basePath + File.separator + upload_excel_filename_finish, true);
 
@@ -413,7 +416,6 @@ public class CollectController extends Controller {
             renderJson(map);
             return;
         }
-        String basePath = CommonUtil.getClassPath() + File.separator + "Excel";
         String upload_excel_filename_user = UUID.randomUUID().toString().toLowerCase() + ".xlsx";
         //判断目录是不是存在
         File file = new File(basePath);
@@ -588,8 +590,8 @@ public class CollectController extends Controller {
      */
     @Before({GET.class})
     @IsLoginInterface({})
-    public void getBureauList(int org_type_id, String org_name,int page, int limit) {
+    public void getBureauList(int org_type_id, String org_name, int page, int limit) {
-        Page<Record> list = cm.getBureauList(org_type_id,org_name, page, limit);
+        Page<Record> list = cm.getBureauList(org_type_id, org_name, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -712,7 +714,6 @@ public class CollectController extends Controller {
             renderJson(kv);
             return;
         }
-        String basePath = CommonUtil.getClassPath() + File.separator + "Excel";
         String excelPath = basePath + File.separator + upload_excel_filename_user;
         //2、提供EXCEL
         if (type_id == 1) {

src/main/java/com/dsideal/QingLong/Start.java

@@ -27,10 +27,7 @@ import com.dsideal.QingLong.Student.Controller.StudentController;
 import com.dsideal.QingLong.StudentYd.Controller.StudentYdController;
 import com.dsideal.QingLong.Teacher.Controller.TeacherController;
 import com.dsideal.QingLong.TeacherYd.Controller.TeacherYdController;
-import com.dsideal.QingLong.Util.LogBackLogFactory;
+import com.dsideal.QingLong.Util.*;
-import com.dsideal.QingLong.Util.PikaKit;
-import com.dsideal.QingLong.Util.PkUtil;
-import com.dsideal.QingLong.Util.RedisKit;
 import com.dsideal.QingLong.YunXiao.Controller.YunXiaoController;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.config.*;
@@ -58,8 +55,16 @@ public class Start extends JFinalConfig {
     public void configConstant(Constants me) {
         //使用LogBack
         me.setLogFactory(new LogBackLogFactory());
+
+        //读取程序运行的目录
+        PropKit.clear();
+        PropKit.use("undertow.properties");
+        CommonUtil.WebRoot = PropKit.get("undertow.resourcePath").split(",")[0];
+        PropKit.clear();
+
         // 加载少量必要配置，随后可用PropKit.get(...)获取值
         PropKit.use("application.properties");
+        System.out.println(PropKit.get("driverClassName"));
         //配置统一的错误页面
         me.setError404View("/html/common/404/index.html");
     }

src/main/java/com/dsideal/QingLong/Util/CommonUtil.java

@@ -31,6 +31,8 @@ public class CommonUtil {
     //在独立的main函数中，使用下面的方式进行声明logback对象
     private static Logger log = LoggerFactory.getLogger(CommonUtil.class);
 
+    public static String WebRoot;
+
     //获取当前年份
     public static String getCurrentYear() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy");