Merge branch 'main' of ssh://gitea.spdis.top/Viajero/Achievement_Inputing

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/Achievement_Inputing.iml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="Flask">
+    <option name="enabled" value="true" />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Achievement_Inputing" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="GOOGLE" />
+    <option name="myDocStringFormat" value="Google" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/templates" />
+      </list>
+    </option>
+  </component>
+</module>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Achievement_Inputing" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Achievement_Inputing" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Achievement_Inputing.iml" filepath="$PROJECT_DIR$/.idea/Achievement_Inputing.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

app.py

@@ -474,7 +474,10 @@ def upload_image():
 
 # 确认录入路由
 @app.route('/confirm', methods=['POST'])
+<<<<<<< HEAD
 @user_or_admin_required
+=======
+>>>>>>> 30645e46ff2a6ee5c12fd95fb21b7eb4fb51c5f0
 def confirm_data():
     """
     确认并录入用户编辑后的数据
@@ -499,11 +502,18 @@ def confirm_data():
         data_string = json_to_string(edited_data)
         print(f"转换后的数据字符串: {data_string}")
         
+<<<<<<< HEAD
         # 构造新的数据结构，只包含data和image字段，并添加用户ID
         processed_data = {
             "data": data_string,
             "image": image_filename,  # 存储图片文件名
             "user_id": session['user_id']  # 添加用户ID关联
+=======
+        # 构造新的数据结构，只包含data和image字段
+        processed_data = {
+            "data": data_string,
+            "image": image_filename  # 存储图片文件名
+>>>>>>> 30645e46ff2a6ee5c12fd95fb21b7eb4fb51c5f0
         }
         print(f"准备存储的数据: {processed_data}")