From 7286803d313f02f045cb7f77b128ec3e8b2ed52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 26 Sep 2024 16:45:48 +0800
Subject: [PATCH] 'commit'

---
 .gitignore                |  17 +++---
 .idea/.gitignore          |   8 ---
 .idea/compiler.xml        |  30 +--------
 .idea/encodings.xml       |  50 +--------------
 .idea/jarRepositories.xml |  10 ---
 .idea/misc.xml            |  17 ------
 .idea/modules.xml         |  11 ++++
 .idea/uiDesigner.xml      | 124 --------------------------------------
 .idea/vcs.xml             |   3 +-
 .idea/workspace.xml       | 107 ++++++++++++++++++++++++++++++++
 ds-base/dsBase.iml        |   8 ---
 dsBase/dsBase.iml         |   1 -
 dsBuild/dsBuild.iml       |   1 -
 dsGw/dsGw.iml             |   1 -
 dsRes.iml                 |   8 ---
 15 files changed, 131 insertions(+), 265 deletions(-)
 delete mode 100644 .idea/.gitignore
 create mode 100644 .idea/modules.xml
 delete mode 100644 .idea/uiDesigner.xml
 create mode 100644 .idea/workspace.xml
 delete mode 100644 ds-base/dsBase.iml
 delete mode 100644 dsRes.iml

diff --git a/.gitignore b/.gitignore
index 74c76d12..d52393f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
-/.idea/
 *.log
 *.class
-/ds-base/target/
-/ds-base/lib/
-/ds-build/target/
-/ds-build/lib/
-/ds-base/.idea/
-/ds-build/.idea/
-/备份/
+/dsBase/target/
+/dsBase/lib/
+/dsBuild/target/
+/dsBuild/lib/
+/dsRes/target/
+/dsRes/lib/
+/dsGw/target/
+/dsGw/lib/
+
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index a7cdac76..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b31d502c..6b6b1c04 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,49 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="BUILD_PROCESS_ADDITIONAL_VM_OPTIONS" value="-Djps.track.ap.dependencies=false" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/dsGw/src/main/resources/archetype-resources" includeSubdirectories="true" />
-    </excludeFromCompile>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="ms-protocol-xingxing" />
-        <module name="ms-openapi" />
-        <module name="ms-protocol-kstar" />
-        <module name="ms-user" />
-        <module name="dsRes" />
-        <module name="ms-protocol-common" />
-        <module name="gw-saas-mgr" />
-        <module name="ds-exam" />
-        <module name="ms-distribute" />
-        <module name="ms-excel" />
-        <module name="ms-station" />
-        <module name="ms-finance" />
-        <module name="ms-order" />
-        <module name="biz-common" />
-        <module name="ms-protocol" />
-        <module name="dsGw" />
-        <module name="ms-protocol-shenghong" />
-        <module name="ms-admin" />
-        <module name="gw-openapi" />
-        <module name="ms-websocket-ocpp" />
         <module name="dsBase" />
+        <module name="dsGw" />
         <module name="dsBuild" />
-        <module name="ms-wallet" />
+        <module name="dsRes" />
       </profile>
     </annotationProcessing>
   </component>
   <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-parameters" />
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="dsBase" options="-parameters" />
       <module name="dsBuild" options="-parameters" />
-      <module name="dsGw" options="" />
-      <module name="dsProject" options="" />
       <module name="dsRes" options="-parameters" />
     </option>
   </component>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 7de6a403..497f4940 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,63 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="file://$PROJECT_DIR$/biz-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/biz-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-nginx/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-nginx/src/main/resources" charset="UTF-8" />
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$/dsBase/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsBase/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsBuild/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsBuild/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dsCommon/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dsCommon/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsGw/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsGw/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsRes/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsRes/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dsResource/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dsResource/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/gw-openapi/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/gw-openapi/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/gw-saas-mgr/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/gw-saas-mgr/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-admin/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-admin/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-distribute/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-distribute/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-excel/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-excel/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-finance/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-finance/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-openapi/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-openapi/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-order/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-order/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-kstar/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-kstar/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-shenghong/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-shenghong/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-xingxing/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol-xingxing/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-protocol/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-station/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-station/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-user/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-user/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-user/src/main/resources/config/dev" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-wallet/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-wallet/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-wallet/src/main/resources/config/dev" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-websocket-ocpp/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-websocket-ocpp/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ms-websocket-ocpp/src/main/resources/config/dev" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/rough-dependencies/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/rough-dependencies/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index dc1c2b4e..e5a91823 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,11 +6,6 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="ali-maven" />
-      <option name="name" value="ali-maven" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="ali-maven" />
       <option name="name" value="ali-maven" />
@@ -26,10 +21,5 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="getui-nexus" />
-      <option name="name" value="getui-nexus" />
-      <option name="url" value="http://mvn.gt.igexin.com/nexus/content/repositories/releases/" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6a1411f7..158c04b5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,25 +5,8 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/ms-task/pom.xml" />
-        <option value="$PROJECT_DIR$/gw-charge/pom.xml" />
-        <option value="$PROJECT_DIR$/ms-base/pom.xml" />
-        <option value="$PROJECT_DIR$/gw-exam/pom.xml" />
-        <option value="$PROJECT_DIR$/ds-base/pom.xml" />
-        <option value="$PROJECT_DIR$/ds-gw/pom.xml" />
-        <option value="$PROJECT_DIR$/ds-build/pom.xml" />
-        <option value="$PROJECT_DIR$/rough-dependencies/pom.xml" />
-        <option value="$PROJECT_DIR$/dsCommon/pom.xml" />
-        <option value="$PROJECT_DIR$/dsResource/pom.xml" />
-        <option value="$PROJECT_DIR$/dsRes/pom.xml" />
       </list>
     </option>
-    <option name="ignoredFiles">
-      <set>
-        <option value="$PROJECT_DIR$/dsCommon/pom.xml" />
-        <option value="$PROJECT_DIR$/rough-dependencies/pom.xml" />
-      </set>
-    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..95e0681d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/dsBase/dsBase.iml" filepath="$PROJECT_DIR$/dsBase/dsBase.iml" />
+      <module fileurl="file://$PROJECT_DIR$/dsBuild/dsBuild.iml" filepath="$PROJECT_DIR$/dsBuild/dsBuild.iml" />
+      <module fileurl="file://$PROJECT_DIR$/dsGw/dsGw.iml" filepath="$PROJECT_DIR$/dsGw/dsGw.iml" />
+      <module fileurl="file://$PROJECT_DIR$/dsRes/dsRes.iml" filepath="$PROJECT_DIR$/dsRes/dsRes.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 6d50cd4d..00000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index f245aa7c..c8397c94 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..1ca19f7b
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ds-base/dsBase.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsBase/dsBase.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dsBase/dsBase.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsBuild/dsBuild.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dsBuild/dsBuild.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsGw/dsGw.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dsGw/dsGw.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsRes.iml" beforeDir="false" />
+    </list>
+    <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="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="customMavenHome" value="D:\apache-maven" />
+        <option name="mavenHomeTypeForPersistence" value="CUSTOM" />
+      </MavenGeneralSettings>
+    </option>
+    <option name="importingSettings">
+      <MavenImportingSettings>
+        <option name="vmOptionsForImporter" value="-Xms1024m -Xmx2048m" />
+      </MavenImportingSettings>
+    </option>
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 4
+}</component>
+  <component name="ProjectId" id="2mbKcle5CV9u33bCPQuGNY1YxDQ" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.importing&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RunManager">
+    <configuration name="GwApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.dsideal.gw.GwApplication" />
+      <module name="dsGw" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.dsideal.gw.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="应用程序.GwApplication" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-jdk-9823dce3aa75-b114ca120d71-intellij.indexing.shared.core-IU-242.21829.142" />
+        <option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-IU-242.21829.142" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="默认任务">
+      <changelist id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="" />
+      <created>1727339918298</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1727339918298</updated>
+      <workItem from="1727339920435" duration="293000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ds-base/dsBase.iml b/ds-base/dsBase.iml
deleted file mode 100644
index 69dd4625..00000000
--- a/ds-base/dsBase.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../dsBase" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/../dsBase/src/main/resource" type="java-resource" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/dsBase/dsBase.iml b/dsBase/dsBase.iml
index 0758c9d8..97714aba 100644
--- a/dsBase/dsBase.iml
+++ b/dsBase/dsBase.iml
@@ -2,7 +2,6 @@
 <module version="4">
   <component name="AdditionalModuleElements">
     <content url="file://$MODULE_DIR$" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resource" type="java-resource" />
     </content>
   </component>
diff --git a/dsBuild/dsBuild.iml b/dsBuild/dsBuild.iml
index 6590b6fe..546154af 100644
--- a/dsBuild/dsBuild.iml
+++ b/dsBuild/dsBuild.iml
@@ -2,7 +2,6 @@
 <module version="4">
   <component name="AdditionalModuleElements">
     <content url="file://$MODULE_DIR$" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
     </content>
   </component>
diff --git a/dsGw/dsGw.iml b/dsGw/dsGw.iml
index 6590b6fe..546154af 100644
--- a/dsGw/dsGw.iml
+++ b/dsGw/dsGw.iml
@@ -2,7 +2,6 @@
 <module version="4">
   <component name="AdditionalModuleElements">
     <content url="file://$MODULE_DIR$" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
     </content>
   </component>
diff --git a/dsRes.iml b/dsRes.iml
deleted file mode 100644
index 0c5c4d56..00000000
--- a/dsRes.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/dsRes" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/dsRes/src/main/resource" type="java-resource" />
-    </content>
-  </component>
-</module>
\ No newline at end of file