From b17afcc149e34c03b771b3e54ef5caaefb066f69 Mon Sep 17 00:00:00 2001
From: Guwan <Guwan@Guwan.com>
Date: Thu, 6 Mar 2025 00:02:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                | 75 ++++++++++++++++++++++++++++++++++
 .idea/workspace.xml       | 84 ++++++++++++++++++++++++++++++++++++---
 oj-spring-boot/.gitignore | 33 ---------------
 oj-vue/.gitignore         | 23 -----------
 oj-vue/oj-vue.iml         |  9 -----
 5 files changed, 153 insertions(+), 71 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 oj-spring-boot/.gitignore
 delete mode 100644 oj-vue/.gitignore
 delete mode 100644 oj-vue/oj-vue.iml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f97a345
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,75 @@
+# Compiled class file
+*.class
+
+# Eclipse
+.project
+.classpath
+.settings/
+
+# Intellij
+*.ipr
+*.iml
+*.iws
+.idea/
+*.java
+
+# Maven
+target/
+
+# Gradle
+build
+.gradle
+
+# Log file
+*.log
+
+# out
+**/out/
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar
+*.tar.gz
+*.rar
+*.pid
+*.orig
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Mac
+.DS_Store
+
+*.tmp
+
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d160568..9dad840 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,47 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2cf2a602-e312-4ccf-b590-3d85bd948e6e" name="变更" comment="第十三次提交&#10;修改.sql文件">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/5fb77bb9-18fc-41e1-adf2-ac6fcbf0f222.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/5fb77bb9-18fc-41e1-adf2-ac6fcbf0f222.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oj-spring-boot/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/oj-spring-boot/.gitignore" afterDir="false" />
+    <list default="true" id="2cf2a602-e312-4ccf-b590-3d85bd948e6e" name="变更" comment="删除多余">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-spring-boot/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/README.md" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/babel.config.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/jsconfig.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/oj-vue.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/package-lock.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/package.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/public/favicon.ico" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/public/index.html" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/App.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/assets/Welcome.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/assets/logo.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/assets/logo_footer.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/components/oj/code/CodeBlock.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/components/oj/common/Footer.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/components/oj/common/NavBar.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/components/oj/rank/Rank.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/components/oj/statistic/Statistic.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/main.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/router/index.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/404/404.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/Main.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/about/About.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/article/Article.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/article/ArticleList.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/article/EditArticle.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/blog/Blog.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/contest/Contest.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/contest/ContestList.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/problem/Problem.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/problem/ProblemList.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/rank/Rank.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/status/Status.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/user/Login.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/user/Register.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/src/views/oj/user/UserPanel.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/oj-vue/vue.config.js" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -23,7 +61,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="dev" />
+        <entry key="$PROJECT_DIR$" value="dev-0308" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -36,6 +74,31 @@
       <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
     </file-type-list>
   </component>
+  <component name="GitToolBoxStore">
+    <option name="recentBranches">
+      <RecentBranches>
+        <option name="branchesForRepo">
+          <list>
+            <RecentBranchesForRepo>
+              <option name="branches">
+                <list>
+                  <RecentBranch>
+                    <option name="branchName" value="dev-0305" />
+                    <option name="lastUsedInstant" value="1741188966" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="dev-0308" />
+                    <option name="lastUsedInstant" value="1741188948" />
+                  </RecentBranch>
+                </list>
+              </option>
+              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
+            </RecentBranchesForRepo>
+          </list>
+        </option>
+      </RecentBranches>
+    </option>
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
@@ -230,7 +293,15 @@
       <option name="project" value="LOCAL" />
       <updated>1727334217442</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="删除多余">
+      <option name="closed" value="true" />
+      <created>1741188797485</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1741188797485</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -276,7 +347,8 @@
     <MESSAGE value="第十次提交&#10;分工完善" />
     <MESSAGE value="第十三次提交&#10;修改.sql文件" />
     <MESSAGE value="测试" />
-    <option name="LAST_COMMIT_MESSAGE" value="测试" />
+    <MESSAGE value="删除多余" />
+    <option name="LAST_COMMIT_MESSAGE" value="删除多余" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/oj-spring-boot/.gitignore b/oj-spring-boot/.gitignore
deleted file mode 100644
index ee6e957..0000000
--- a/oj-spring-boot/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea/
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/oj-vue/.gitignore b/oj-vue/.gitignore
deleted file mode 100644
index 403adbc..0000000
--- a/oj-vue/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/oj-vue/oj-vue.iml b/oj-vue/oj-vue.iml
deleted file mode 100644
index 8021953..0000000
--- a/oj-vue/oj-vue.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file