From 395c750eed8177bbfb752adbf3480155c704d9de Mon Sep 17 00:00:00 2001
From: An Yong Shuai <1539893812@qq.com>
Date: Wed, 19 Jun 2024 20:35:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8B=87=E5=B8=85=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/git_toolbox_prj.xml                     | 15 +++++
 .idea/shelf/___.xml                           |  4 ++
 .../shelved.patch                             | 56 ++++++++++++++++
 .idea/workspace.xml                           | 65 ++++++++++++++++++-
 .../java/com/etl/common/result/GitTest.java   |  1 +
 5 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 .idea/git_toolbox_prj.xml
 create mode 100644 .idea/shelf/___.xml
 create mode 100644 .idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch

diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
new file mode 100644
index 0000000..02b915b
--- /dev/null
+++ b/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/shelf/___.xml b/.idea/shelf/___.xml
new file mode 100644
index 0000000..a7978f4
--- /dev/null
+++ b/.idea/shelf/___.xml
@@ -0,0 +1,4 @@
+<changelist name="在变基之前未提交的更改_[更改]" date="1718799241890" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch" />
+  <option name="DESCRIPTION" value="在变基之前未提交的更改 [更改]" />
+</changelist>
\ No newline at end of file
diff --git a/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch b/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
new file mode 100644
index 0000000..182f376
--- /dev/null
+++ b/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
@@ -0,0 +1,56 @@
+Index: .idea/workspace.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n  <component name=\"AutoImportSettings\">\r\n    <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n  </component>\r\n  <component name=\"ChangeListManager\">\r\n    <list default=\"true\" id=\"e53020f6-f301-415a-a26a-d22b9ac05907\" name=\"更改\" comment=\"\">\r\n      <change afterPath=\"$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch\" afterDir=\"false\" />\r\n      <change afterPath=\"$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]1/shelved.patch\" afterDir=\"false\" />\r\n    </list>\r\n    <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n    <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n    <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n    <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n  </component>\r\n  <component name=\"Git.Settings\">\r\n    <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n      <map>\r\n        <entry key=\"$PROJECT_DIR$\" value=\"ays\" />\r\n      </map>\r\n    </option>\r\n    <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n  </component>\r\n  <component name=\"MarkdownSettingsMigration\">\r\n    <option name=\"stateVersion\" value=\"1\" />\r\n  </component>\r\n  <component name=\"MavenImportPreferences\">\r\n    <option name=\"generalSettings\">\r\n      <MavenGeneralSettings>\r\n        <option name=\"customMavenHome\" value=\"$PROJECT_DIR$/../../maven/apache-maven-3.6.3\" />\r\n        <option name=\"mavenHomeTypeForPersistence\" value=\"CUSTOM\" />\r\n        <option name=\"userSettingsFile\" value=\"D:\\maven\\apache-maven-3.6.3\\conf\\settings.xml\" />\r\n      </MavenGeneralSettings>\r\n    </option>\r\n  </component>\r\n  <component name=\"ProjectColorInfo\">{\r\n  &quot;customColor&quot;: &quot;&quot;,\r\n  &quot;associatedIndex&quot;: 3\r\n}</component>\r\n  <component name=\"ProjectId\" id=\"2i5i5wT47d5w5d34MR4XOoCQo7s\" />\r\n  <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\" />\r\n  <component name=\"ProjectViewState\">\r\n    <option name=\"showLibraryContents\" value=\"true\" />\r\n  </component>\r\n  <component name=\"PropertiesComponent\"><![CDATA[{\r\n  \"keyToString\": {\r\n    \"RequestMappingsPanelOrder0\": \"0\",\r\n    \"RequestMappingsPanelOrder1\": \"1\",\r\n    \"RequestMappingsPanelWidth0\": \"75\",\r\n    \"RequestMappingsPanelWidth1\": \"75\",\r\n    \"RunOnceActivity.OpenProjectViewOnStart\": \"true\",\r\n    \"RunOnceActivity.ShowReadmeOnStart\": \"true\",\r\n    \"WebServerToolWindowFactoryState\": \"false\",\r\n    \"git-widget-placeholder\": \"ays\",\r\n    \"last_opened_file_path\": \"D:/workspace/etl-cloud\",\r\n    \"nodejs_package_manager_path\": \"npm\",\r\n    \"settings.editor.selected.configurable\": \"project.propVCSSupport.DirectoryMappings\",\r\n    \"spring.configuration.checksum\": \"a925cb78a857f19db6d9680ed9c97ee6\",\r\n    \"vue.rearranger.settings.migration\": \"true\"\r\n  }\r\n}]]></component>\r\n  <component name=\"RunManager\">\r\n    <configuration name=\"EtlGatewayApplication\" type=\"SpringBootApplicationConfigurationType\" factoryName=\"Spring Boot\" temporary=\"true\" nameIsGenerated=\"true\">\r\n      <module name=\"etl-gateway\" />\r\n      <option name=\"SPRING_BOOT_MAIN_CLASS\" value=\"com.etl.gateway.EtlGatewayApplication\" />\r\n      <extension name=\"coverage\">\r\n        <pattern>\r\n          <option name=\"PATTERN\" value=\"com.etl.gateway.*\" />\r\n          <option name=\"ENABLED\" value=\"true\" />\r\n        </pattern>\r\n      </extension>\r\n      <method v=\"2\">\r\n        <option name=\"Make\" enabled=\"true\" />\r\n      </method>\r\n    </configuration>\r\n    <recent_temporary>\r\n      <list>\r\n        <item itemvalue=\"Spring Boot.EtlGatewayApplication\" />\r\n      </list>\r\n    </recent_temporary>\r\n  </component>\r\n  <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"应用程序级\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n  <component name=\"TaskManager\">\r\n    <task active=\"true\" id=\"Default\" summary=\"默认任务\">\r\n      <changelist id=\"e53020f6-f301-415a-a26a-d22b9ac05907\" name=\"更改\" comment=\"\" />\r\n      <created>1718786660406</created>\r\n      <option name=\"number\" value=\"Default\" />\r\n      <option name=\"presentableId\" value=\"Default\" />\r\n      <updated>1718786660406</updated>\r\n      <workItem from=\"1718786662962\" duration=\"189000\" />\r\n      <workItem from=\"1718786877196\" duration=\"128000\" />\r\n      <workItem from=\"1718787019689\" duration=\"267000\" />\r\n      <workItem from=\"1718787313341\" duration=\"265000\" />\r\n    </task>\r\n    <servers />\r\n  </component>\r\n  <component name=\"TypeScriptGeneratedFilesManager\">\r\n    <option name=\"version\" value=\"3\" />\r\n  </component>\r\n  <component name=\"Vcs.Log.Tabs.Properties\">\r\n    <option name=\"TAB_STATES\">\r\n      <map>\r\n        <entry key=\"MAIN\">\r\n          <value>\r\n            <State />\r\n          </value>\r\n        </entry>\r\n      </map>\r\n    </option>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/workspace.xml b/.idea/workspace.xml
+--- a/.idea/workspace.xml	(revision 072e42f135ead1cc90500890fbc74b3ab042968a)
++++ b/.idea/workspace.xml	(date 1718798907691)
+@@ -4,9 +4,8 @@
+     <option name="autoReloadType" value="SELECTIVE" />
+   </component>
+   <component name="ChangeListManager">
+-    <list default="true" id="e53020f6-f301-415a-a26a-d22b9ac05907" name="更改" comment="">
+-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch" afterDir="false" />
+-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]1/shelved.patch" afterDir="false" />
++    <list default="true" id="e53020f6-f301-415a-a26a-d22b9ac05907" name="更改" comment="安勇帅提交测试">
++      <change afterPath="$PROJECT_DIR$/etl-common/src/main/java/com/etl/common/result/GitTest.java" afterDir="false" />
+     </list>
+     <option name="SHOW_DIALOG" value="false" />
+     <option name="HIGHLIGHT_CONFLICTS" value="true" />
+@@ -53,6 +52,7 @@
+     "WebServerToolWindowFactoryState": "false",
+     "git-widget-placeholder": "ays",
+     "last_opened_file_path": "D:/workspace/etl-cloud",
++    "node.js.selected.package.tslint": "(autodetect)",
+     "nodejs_package_manager_path": "npm",
+     "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
+     "spring.configuration.checksum": "a925cb78a857f19db6d9680ed9c97ee6",
+@@ -92,6 +92,15 @@
+       <workItem from="1718787019689" duration="267000" />
+       <workItem from="1718787313341" duration="265000" />
+     </task>
++    <task id="LOCAL-00001" summary="安勇帅提交测试">
++      <option name="closed" value="true" />
++      <created>1718794301341</created>
++      <option name="number" value="00001" />
++      <option name="presentableId" value="LOCAL-00001" />
++      <option name="project" value="LOCAL" />
++      <updated>1718794301341</updated>
++    </task>
++    <option name="localTasksCounter" value="2" />
+     <servers />
+   </component>
+   <component name="TypeScriptGeneratedFilesManager">
+@@ -108,4 +117,8 @@
+       </map>
+     </option>
+   </component>
++  <component name="VcsManagerConfiguration">
++    <MESSAGE value="安勇帅提交测试" />
++    <option name="LAST_COMMIT_MESSAGE" value="安勇帅提交测试" />
++  </component>
+ </project>
+\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 64d5f76..306228b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,15 +4,24 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e53020f6-f301-415a-a26a-d22b9ac05907" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]1/shelved.patch" afterDir="false" />
+    <list default="true" id="e53020f6-f301-415a-a26a-d22b9ac05907" name="更改" comment="安勇帅提交测试">
+      <change afterPath="$PROJECT_DIR$/.idea/git_toolbox_prj.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-common/src/main/java/com/etl/common/result/GitTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/etl-common/src/main/java/com/etl/common/result/GitTest.java" afterDir="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="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
@@ -53,7 +62,11 @@
     "WebServerToolWindowFactoryState": "false",
     "git-widget-placeholder": "ays",
     "last_opened_file_path": "D:/workspace/etl-cloud",
+    "node.js.selected.package.tslint": "(autodetect)",
     "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "模块",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
     "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
     "spring.configuration.checksum": "a925cb78a857f19db6d9680ed9c97ee6",
     "vue.rearranger.settings.migration": "true"
@@ -92,12 +105,54 @@
       <workItem from="1718787019689" duration="267000" />
       <workItem from="1718787313341" duration="265000" />
     </task>
+    <task id="LOCAL-00001" summary="安勇帅提交测试">
+      <option name="closed" value="true" />
+      <created>1718794301341</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1718794301341</updated>
+    </task>
+    <task id="LOCAL-00002" summary="安勇帅提交测试">
+      <option name="closed" value="true" />
+      <created>1718798913704</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1718798913704</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="origin/ays" />
+                </option>
+              </RecentGroup>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="ays" />
+                </option>
+              </RecentGroup>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="HEAD" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
@@ -108,4 +163,8 @@
       </map>
     </option>
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="安勇帅提交测试" />
+    <option name="LAST_COMMIT_MESSAGE" value="安勇帅提交测试" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/etl-common/src/main/java/com/etl/common/result/GitTest.java b/etl-common/src/main/java/com/etl/common/result/GitTest.java
index 13f83d2..ef9994d 100644
--- a/etl-common/src/main/java/com/etl/common/result/GitTest.java
+++ b/etl-common/src/main/java/com/etl/common/result/GitTest.java
@@ -1,4 +1,5 @@
 package com.etl.common.result;
 
 public class GitTest {
+
 }