From e9333b022f80ca2cd3c75bbb5aafe737d02bf866 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 08:23:41 +0800
Subject: [PATCH] 'commit'

---
 .../main/java/com/dsideal/dsBase/Start.java   |  3 --
 .../.idea/ExcelImportTemplate.iml             |  8 ----
 .../inspectionProfiles/Project_Default.xml    |  9 ----
 .../inspectionProfiles/profiles_settings.xml  |  6 ---
 .../ExcelImportTemplate/.idea/misc.xml        |  4 --
 .../ExcelImportTemplate/.idea/modules.xml     |  8 ----
 .../ExcelImportTemplate/.idea/vcs.xml         |  6 ---
 .../ExcelImportTemplate/.idea/workspace.xml   | 42 -------------------
 8 files changed, 86 deletions(-)
 delete mode 100644 dsBase/src/main/resources/ExcelImportTemplate/.idea/ExcelImportTemplate.iml
 delete mode 100644 dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 dsBase/src/main/resources/ExcelImportTemplate/.idea/misc.xml
 delete mode 100644 dsBase/src/main/resources/ExcelImportTemplate/.idea/modules.xml
 delete mode 100644 dsBase/src/main/resources/ExcelImportTemplate/.idea/vcs.xml
 delete mode 100644 dsBase/src/main/resources/ExcelImportTemplate/.idea/workspace.xml

diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Start.java b/dsBase/src/main/java/com/dsideal/dsBase/Start.java
index 1077749a..f64df1db 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/Start.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/Start.java
@@ -22,7 +22,6 @@ import com.dsideal.dsBase.Util.PkUtil;
 import com.jfinal.config.*;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.PropKit;
-import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
@@ -48,8 +47,6 @@ public class Start extends JFinalConfig {
     @Override
     public void configConstant(Constants me) {
         me.setLogFactory(new LogBackLogFactory());
-        PropKit.use("application.properties");
-        me.setError404View("/html/common/404/index.html");
     }
 
     /**
diff --git a/dsBase/src/main/resources/ExcelImportTemplate/.idea/ExcelImportTemplate.iml b/dsBase/src/main/resources/ExcelImportTemplate/.idea/ExcelImportTemplate.iml
deleted file mode 100644
index d9e6024f..00000000
--- a/dsBase/src/main/resources/ExcelImportTemplate/.idea/ExcelImportTemplate.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/Project_Default.xml b/dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index c26d685f..00000000
--- a/dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="DuplicatedCode" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="PyListCreationInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="PyPep8NamingInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="PyProtectedMemberInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/profiles_settings.xml b/dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da..00000000
--- a/dsBase/src/main/resources/ExcelImportTemplate/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/ExcelImportTemplate/.idea/misc.xml b/dsBase/src/main/resources/ExcelImportTemplate/.idea/misc.xml
deleted file mode 100644
index 8d93904d..00000000
--- a/dsBase/src/main/resources/ExcelImportTemplate/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/ExcelImportTemplate/.idea/modules.xml b/dsBase/src/main/resources/ExcelImportTemplate/.idea/modules.xml
deleted file mode 100644
index 59750d26..00000000
--- a/dsBase/src/main/resources/ExcelImportTemplate/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ExcelImportTemplate.iml" filepath="$PROJECT_DIR$/.idea/ExcelImportTemplate.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/ExcelImportTemplate/.idea/vcs.xml b/dsBase/src/main/resources/ExcelImportTemplate/.idea/vcs.xml
deleted file mode 100644
index 15b5e29f..00000000
--- a/dsBase/src/main/resources/ExcelImportTemplate/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/ExcelImportTemplate/.idea/workspace.xml b/dsBase/src/main/resources/ExcelImportTemplate/.idea/workspace.xml
deleted file mode 100644
index 02e51a56..00000000
--- a/dsBase/src/main/resources/ExcelImportTemplate/.idea/workspace.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="c9117f15-5ada-42d4-a094-bacc4da713a5" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../../.." />
-  </component>
-  <component name="ProjectId" id="29h7HfV4pVPLtlgAYRGTuSeM70z" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "last_opened_file_path": "D:/dsWork/baseServiceJava/src/main/resource/Py"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="c9117f15-5ada-42d4-a094-bacc4da713a5" name="Changes" comment="" />
-      <created>1653553376213</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1653553376213</updated>
-      <workItem from="1653553377383" duration="14000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>
\ No newline at end of file