Merge remote-tracking branch 'origin/main'

.idea/market-api.iml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.system.id="pyproject.toml" type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/480T/market_api" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/modules.xml

@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/iStore_Docker_Compose.iml" filepath="$PROJECT_DIR$/.idea/iStore_Docker_Compose.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/market-api.iml" filepath="$PROJECT_DIR$/.idea/market-api.iml" />
     </modules>
   </component>
 </project>

.idea/workspace.xml

@@ -5,7 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ae3fb6a0-aca4-4c0a-858b-91952e6dcdd3" name="更改" comment="update 26.7.27">
-      <change beforePath="$PROJECT_DIR$/4600Pro/yuvomi/.env" beforeDir="false" afterPath="$PROJECT_DIR$/4600Pro/yuvomi/.env" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,22 +24,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    "RunOnceActivity.git.unshallow": "true",
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    &quot;codeWithMe.voiceChat.enabledByDefault&quot;: &quot;false&quot;,
+    "codeWithMe.voiceChat.enabledByDefault": "false",
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    "git-widget-placeholder": "main",
-    &quot;last_opened_file_path&quot;: &quot;/Users/kun/PycharmProjects/Docker_Compose/480T/yuvomi&quot;,
+    "last_opened_file_path": "/Users/kun/PycharmProjects/Docker_Compose/480T/yuvomi",
-    &quot;node.js.detected.package.jshint&quot;: &quot;true&quot;,
+    "node.js.detected.package.jshint": "true",
-    &quot;node.js.selected.package.jshint&quot;: &quot;&quot;,
+    "node.js.selected.package.jshint": "",
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "configurable.group.project"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/480T/yuvomi" />
@@ -51,8 +52,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-js-predefined-d6986cc7102b-4abd2a77f808-JavaScript-PY-262.8665.309" />
+        <option value="bundled-js-predefined-d6986cc7102b-4abd2a77f808-JavaScript-PY-262.8665.369" />
-        <option value="bundled-python-sdk-c6d794e1806d-5bd6d13a2a75-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-262.8665.309" />
+        <option value="bundled-python-sdk-6fa658e1df1a-5bd6d13a2a75-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-262.8665.369" />
       </set>
     </attachedChunks>
   </component>
@@ -69,7 +70,10 @@
       <workItem from="1785117096824" duration="55000" />
       <workItem from="1785117158260" duration="1000" />
       <workItem from="1785118558426" duration="729000" />
-      <workItem from="1785119377011" duration="746000" />
+      <workItem from="1785119377011" duration="1872000" />
+      <workItem from="1785220412801" duration="13000" />
+      <workItem from="1785223191705" duration="1000" />
+      <workItem from="1785223194581" duration="22000" />
     </task>
     <task id="LOCAL-00001" summary="update 26.7.27">
       <option name="closed" value="true" />
@@ -119,7 +123,39 @@
       <option name="project" value="LOCAL" />
       <updated>1785119906941</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="update 26.7.27">
+      <option name="closed" value="true" />
+      <created>1785120129210</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1785120129210</updated>
+    </task>
+    <task id="LOCAL-00008" summary="update 26.7.27">
+      <option name="closed" value="true" />
+      <created>1785120154958</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1785120154958</updated>
+    </task>
+    <task id="LOCAL-00009" summary="update 26.7.27">
+      <option name="closed" value="true" />
+      <created>1785120590256</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1785120590256</updated>
+    </task>
+    <task id="LOCAL-00010" summary="update 26.7.27">
+      <option name="closed" value="true" />
+      <created>1785120682944</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1785120682944</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

480T/market_api/pyproject.toml

@@ -1,17 +0,0 @@
-[project]
-name = "market-api"
-version = "0.1.0"
-description = "FastAPI service for importing monthly market Excel data into PostgreSQL."
-requires-python = ">=3.12"
-dependencies = [
-    "fastapi>=0.115,<1.0",
-    "uvicorn[standard]>=0.30,<1.0",
-    "python-multipart>=0.0.20,<1.0",
-    "openpyxl>=3.1,<4.0",
-    "psycopg[binary]>=3.2,<4.0",
-    "python-docx>=1.1,<2.0",
-]
-
-[tool.ruff]
-line-length = 100
-target-version = "py312"