yangrenwei před 3 roky
rodič
revize
b5f318b19a
26 změnil soubory, kde provedl 2079 přidání a 0 odebrání
  1. 4 0
      .idea/shelf/_2021_12_28_14_31____.xml
  2. 4 0
      .idea/shelf/_2021_12_28_14_43____.xml
  3. 4 0
      .idea/shelf/_2021_12_28_16_13____.xml
  4. 4 0
      .idea/shelf/_2021_12_28_22_22____.xml
  5. 4 0
      .idea/shelf/_2021_12_29_13_39____.xml
  6. 4 0
      .idea/shelf/_2021_12_29_13_46____.xml
  7. 4 0
      .idea/shelf/_2021_12_29_13_47____.xml
  8. 49 0
      .idea/shelf/_2021_12_30_13_43____.xml
  9. 137 0
      .idea/shelf/在进行更新之前于_2021_12_28_14_31_取消提交了变更_[变更]/shelved.patch
  10. 104 0
      .idea/shelf/在进行更新之前于_2021_12_28_14_43_取消提交了变更_[变更]/shelved.patch
  11. 74 0
      .idea/shelf/在进行更新之前于_2021_12_28_16_13_取消提交了变更_[变更]/shelved.patch
  12. 240 0
      .idea/shelf/在进行更新之前于_2021_12_28_22_22_取消提交了变更_[变更]/shelved.patch
  13. 40 0
      .idea/shelf/在进行更新之前于_2021_12_29_13_39_取消提交了变更_[变更]/shelved.patch
  14. 215 0
      .idea/shelf/在进行更新之前于_2021_12_29_13_46_取消提交了变更_[变更]/shelved.patch
  15. 241 0
      .idea/shelf/在进行更新之前于_2021_12_29_13_47_取消提交了变更_[变更]/shelved.patch
  16. 163 0
      .idea/workspace.xml
  17. 78 0
      target/classes/DataBase.sql
  18. 31 0
      target/classes/MyBatis-config.xml
  19. 4 0
      target/classes/db.properties
  20. 83 0
      target/classes/generatorConfig.xml
  21. 114 0
      target/classes/myBatisMap/GoodsMapper.xml
  22. 141 0
      target/classes/myBatisMap/NodeinfoMapper.xml
  23. 103 0
      target/classes/myBatisMap/SelectionMapper.xml
  24. 59 0
      target/classes/myBatisMap/StoreMapper.xml
  25. 114 0
      target/classes/myBatisMap/UseraccountMapper.xml
  26. 61 0
      target/classes/springmvc-config.xml

+ 4 - 0
.idea/shelf/_2021_12_28_14_31____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2021_12_28_14_31_取消提交了变更_[变更]" date="1640673080569" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_28_14_31_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/28 14:31 取消提交了变更 [变更]" />
+</changelist>

+ 4 - 0
.idea/shelf/_2021_12_28_14_43____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2021_12_28_14_43_取消提交了变更_[变更]" date="1640673861888" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_28_14_43_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/28 14:43 取消提交了变更 [变更]" />
+</changelist>

+ 4 - 0
.idea/shelf/_2021_12_28_16_13____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2021_12_28_16_13_取消提交了变更_[变更]" date="1640679238406" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_28_16_13_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/28 16:13 取消提交了变更 [变更]" />
+</changelist>

+ 4 - 0
.idea/shelf/_2021_12_28_22_22____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2021_12_28_22_22_取消提交了变更_[变更]" date="1640701337983" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_28_22_22_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/28 22:22 取消提交了变更 [变更]" />
+</changelist>

+ 4 - 0
.idea/shelf/_2021_12_29_13_39____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2021_12_29_13_39_取消提交了变更_[变更]" date="1640756387179" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_29_13_39_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/29 13:39 取消提交了变更 [变更]" />
+</changelist>

+ 4 - 0
.idea/shelf/_2021_12_29_13_46____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2021_12_29_13_46_取消提交了变更_[变更]" date="1640756817681" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_29_13_46_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/29 13:46 取消提交了变更 [变更]" />
+</changelist>

+ 4 - 0
.idea/shelf/_2021_12_29_13_47____.xml

@@ -0,0 +1,4 @@
+<changelist name="在进行更新之前于_2021_12_29_13_47_取消提交了变更_[变更]" date="1640756858265" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_29_13_47_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/29 13:47 取消提交了变更 [变更]" />
+</changelist>

+ 49 - 0
.idea/shelf/_2021_12_30_13_43____.xml

@@ -0,0 +1,49 @@
+<changelist name="在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]" date="1640843015918" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行更新之前于 2021/12/30 13:43 取消提交了变更 [变更]" />
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/Useraccount.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/Useraccount.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/Useraccount.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/Selection.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/Selection.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/Selection.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/UseraccountMapper.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/UseraccountMapper.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/UseraccountMapper.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/Goods.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/Goods.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/Goods.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/GoodsMapper.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/GoodsMapper.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/GoodsMapper.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/SelectionMapper.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/SelectionMapper.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/SelectionMapper.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/UseraccountKey.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/UseraccountKey.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/UseraccountKey.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/StoreMapper.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/StoreMapper.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/StoreMapper.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="target/classes/WebsiteES/myBatis/Store.class" />
+    <option name="AFTER_PATH" value="target/classes/WebsiteES/myBatis/Store.class" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2021_12_30_13_43_取消提交了变更_[变更]/Store.class" />
+  </binary>
+</changelist>

+ 137 - 0
.idea/shelf/在进行更新之前于_2021_12_28_14_31_取消提交了变更_[变更]/shelved.patch

@@ -0,0 +1,137 @@
+Index: .idea/misc.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/misc.xml b/.idea/misc.xml
+new file mode 100644
+--- /dev/null	(date 1640672949933)
++++ b/.idea/misc.xml	(date 1640672949933)
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="ExternalStorageConfigurationManager" enabled="true" />
++  <component name="FrameworkDetectionExcludesConfiguration">
++    <file type="web" url="file://$PROJECT_DIR$" />
++  </component>
++  <component name="MavenProjectsManager">
++    <option name="originalFiles">
++      <list>
++        <option value="$PROJECT_DIR$/pom.xml" />
++      </list>
++    </option>
++  </component>
++  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
++</project>
+\ No newline at end of file
+Index: .idea/compiler.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/compiler.xml b/.idea/compiler.xml
+new file mode 100644
+--- /dev/null	(date 1640672949913)
++++ b/.idea/compiler.xml	(date 1640672949913)
+@@ -0,0 +1,13 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="CompilerConfiguration">
++    <annotationProcessing>
++      <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="raoyin" />
++      </profile>
++    </annotationProcessing>
++  </component>
++</project>
+\ No newline at end of file
+Index: .idea/runConfigurations.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
+new file mode 100644
+--- /dev/null	(date 1640672949966)
++++ b/.idea/runConfigurations.xml	(date 1640672949966)
+@@ -0,0 +1,10 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="RunConfigurationProducerService">
++    <option name="ignoredProducers">
++      <set>
++        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
++      </set>
++    </option>
++  </component>
++</project>
+\ No newline at end of file
+Index: .idea/jarRepositories.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
+new file mode 100644
+--- /dev/null	(date 1640672949950)
++++ b/.idea/jarRepositories.xml	(date 1640672949950)
+@@ -0,0 +1,20 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="RemoteRepositoriesConfiguration">
++    <remote-repository>
++      <option name="id" value="central" />
++      <option name="name" value="Central Repository" />
++      <option name="url" value="https://repo.maven.apache.org/maven2" />
++    </remote-repository>
++    <remote-repository>
++      <option name="id" value="central" />
++      <option name="name" value="Maven Central repository" />
++      <option name="url" value="https://repo1.maven.org/maven2" />
++    </remote-repository>
++    <remote-repository>
++      <option name="id" value="jboss.community" />
++      <option name="name" value="JBoss Community repository" />
++      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
++    </remote-repository>
++  </component>
++</project>
+\ No newline at end of file
+Index: .idea/.gitignore
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/.gitignore b/.idea/.gitignore
+new file mode 100644
+--- /dev/null	(date 1640672950708)
++++ b/.idea/.gitignore	(date 1640672950708)
+@@ -0,0 +1,8 @@
++# 默认忽略的文件
++/shelf/
++/workspace.xml
++# Datasource local storage ignored files
++/dataSources/
++/dataSources.local.xml
++# 基于编辑器的 HTTP 客户端请求
++/httpRequests/
+Index: .idea/vcs.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/vcs.xml b/.idea/vcs.xml
+new file mode 100644
+--- /dev/null	(date 1640672949983)
++++ b/.idea/vcs.xml	(date 1640672949983)
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="VcsDirectoryMappings">
++    <mapping directory="" vcs="Git" />
++  </component>
++</project>
+\ No newline at end of file

+ 104 - 0
.idea/shelf/在进行更新之前于_2021_12_28_14_43_取消提交了变更_[变更]/shelved.patch

@@ -0,0 +1,104 @@
+Index: .idea/.gitignore
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+># 默认忽略的文件\r\n/shelf/\r\n/workspace.xml\r\n# 数据源本地存储已忽略文件\r\n/dataSources/\r\n/dataSources.local.xml\r\n# 基于编辑器的 HTTP 客户端请求\r\n/httpRequests/\r\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/.gitignore b/.idea/.gitignore
+--- a/.idea/.gitignore	(revision f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d)
++++ b/.idea/.gitignore	(date 1640673080058)
+@@ -1,7 +1,7 @@
+ # 默认忽略的文件
+ /shelf/
+ /workspace.xml
+-# 数据源本地存储已忽略文件
++# Datasource local storage ignored files
+ /dataSources/
+ /dataSources.local.xml
+ # 基于编辑器的 HTTP 客户端请求
+Index: .idea/misc.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=\"FrameworkDetectionExcludesConfiguration\">\r\n    <file type=\"web\" url=\"file://$PROJECT_DIR$\" />\r\n  </component>\r\n  <component name=\"MavenProjectsManager\">\r\n    <option name=\"originalFiles\">\r\n      <list>\r\n        <option value=\"$PROJECT_DIR$/pom.xml\" />\r\n      </list>\r\n    </option>\r\n  </component>\r\n  <component name=\"ProjectRootManager\" version=\"2\" languageLevel=\"JDK_15\" default=\"true\" project-jdk-name=\"15\" project-jdk-type=\"JavaSDK\" />\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/misc.xml b/.idea/misc.xml
+--- a/.idea/misc.xml	(revision f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d)
++++ b/.idea/misc.xml	(date 1640673080020)
+@@ -1,5 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project version="4">
++  <component name="ExternalStorageConfigurationManager" enabled="true" />
+   <component name="FrameworkDetectionExcludesConfiguration">
+     <file type="web" url="file://$PROJECT_DIR$" />
+   </component>
+@@ -10,5 +11,5 @@
+       </list>
+     </option>
+   </component>
+-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK" />
++  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
+ </project>
+\ No newline at end of file
+Index: .idea/compiler.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=\"CompilerConfiguration\">\r\n    <annotationProcessing>\r\n      <profile name=\"Maven default annotation processors profile\" enabled=\"true\">\r\n        <sourceOutputDir name=\"target/generated-sources/annotations\" />\r\n        <sourceTestOutputDir name=\"target/generated-test-sources/test-annotations\" />\r\n        <outputRelativeToContentRoot value=\"true\" />\r\n        <module name=\"raoyin\" />\r\n      </profile>\r\n    </annotationProcessing>\r\n    <bytecodeTargetLevel>\r\n      <module name=\"raoyin\" target=\"1.7\" />\r\n    </bytecodeTargetLevel>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/compiler.xml b/.idea/compiler.xml
+--- a/.idea/compiler.xml	(revision f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d)
++++ b/.idea/compiler.xml	(date 1640673080033)
+@@ -9,8 +9,5 @@
+         <module name="raoyin" />
+       </profile>
+     </annotationProcessing>
+-    <bytecodeTargetLevel>
+-      <module name="raoyin" target="1.7" />
+-    </bytecodeTargetLevel>
+   </component>
+ </project>
+\ No newline at end of file
+Index: .idea/vcs.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=\"VcsDirectoryMappings\">\r\n    <mapping directory=\"$PROJECT_DIR$\" vcs=\"Git\" />\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/vcs.xml b/.idea/vcs.xml
+--- a/.idea/vcs.xml	(revision f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d)
++++ b/.idea/vcs.xml	(date 1640673080070)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project version="4">
+   <component name="VcsDirectoryMappings">
+-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
++    <mapping directory="" vcs="Git" />
+   </component>
+ </project>
+\ No newline at end of file
+Index: .idea/runConfigurations.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
+new file mode 100644
+--- /dev/null	(date 1640673080044)
++++ b/.idea/runConfigurations.xml	(date 1640673080044)
+@@ -0,0 +1,10 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="RunConfigurationProducerService">
++    <option name="ignoredProducers">
++      <set>
++        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
++      </set>
++    </option>
++  </component>
++</project>
+\ No newline at end of file

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 74 - 0
.idea/shelf/在进行更新之前于_2021_12_28_16_13_取消提交了变更_[变更]/shelved.patch


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 240 - 0
.idea/shelf/在进行更新之前于_2021_12_28_22_22_取消提交了变更_[变更]/shelved.patch


+ 40 - 0
.idea/shelf/在进行更新之前于_2021_12_29_13_39_取消提交了变更_[变更]/shelved.patch

@@ -0,0 +1,40 @@
+Index: .idea/compiler.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=\"CompilerConfiguration\">\r\n    <annotationProcessing>\r\n      <profile name=\"Maven default annotation processors profile\" enabled=\"true\">\r\n        <sourceOutputDir name=\"target/generated-sources/annotations\" />\r\n        <sourceTestOutputDir name=\"target/generated-test-sources/test-annotations\" />\r\n        <outputRelativeToContentRoot value=\"true\" />\r\n        <module name=\"raoyin\" />\r\n      </profile>\r\n    </annotationProcessing>\r\n    <bytecodeTargetLevel>\r\n      <module name=\"raoyin\" target=\"1.7\" />\r\n    </bytecodeTargetLevel>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/compiler.xml b/.idea/compiler.xml
+--- a/.idea/compiler.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/compiler.xml	(date 1640756339846)
+@@ -6,7 +6,6 @@
+         <sourceOutputDir name="target/generated-sources/annotations" />
+         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+         <outputRelativeToContentRoot value="true" />
+-        <module name="raoyin" />
+       </profile>
+     </annotationProcessing>
+     <bytecodeTargetLevel>
+Index: .idea/vcs.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=\"VcsDirectoryMappings\">\r\n<<<<<<< HEAD\r\n    <mapping directory=\"\" vcs=\"Git\" />\r\n=======\r\n    <mapping directory=\"$PROJECT_DIR$\" vcs=\"Git\" />\r\n>>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/vcs.xml b/.idea/vcs.xml
+--- a/.idea/vcs.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/vcs.xml	(date 1640756382679)
+@@ -1,10 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project version="4">
+   <component name="VcsDirectoryMappings">
+-<<<<<<< HEAD
+-    <mapping directory="" vcs="Git" />
+-=======
+     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+->>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d
+   </component>
+ </project>
+\ No newline at end of file

+ 215 - 0
.idea/shelf/在进行更新之前于_2021_12_29_13_46_取消提交了变更_[变更]/shelved.patch

@@ -0,0 +1,215 @@
+Index: .idea/compiler.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=\"CompilerConfiguration\">\r\n    <annotationProcessing>\r\n      <profile name=\"Maven default annotation processors profile\" enabled=\"true\">\r\n        <sourceOutputDir name=\"target/generated-sources/annotations\" />\r\n        <sourceTestOutputDir name=\"target/generated-test-sources/test-annotations\" />\r\n        <outputRelativeToContentRoot value=\"true\" />\r\n        <module name=\"raoyin\" />\r\n      </profile>\r\n    </annotationProcessing>\r\n    <bytecodeTargetLevel>\r\n      <module name=\"raoyin\" target=\"1.7\" />\r\n    </bytecodeTargetLevel>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/compiler.xml b/.idea/compiler.xml
+--- a/.idea/compiler.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/compiler.xml	(date 1640756746772)
+@@ -10,7 +10,7 @@
+       </profile>
+     </annotationProcessing>
+     <bytecodeTargetLevel>
+-      <module name="raoyin" target="1.7" />
++      <module name="raoyin" target="1.8" />
+     </bytecodeTargetLevel>
+   </component>
+ </project>
+\ No newline at end of file
+Index: .idea/libraries/Maven__junit_junit_4_11.xml
+===================================================================
+diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml
+deleted file mode 100644
+--- a/.idea/libraries/Maven__junit_junit_4_11.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ /dev/null	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
+@@ -1,13 +0,0 @@
+-<component name="libraryTable">
+-  <library name="Maven: junit:junit:4.11">
+-    <CLASSES>
+-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11.jar!/" />
+-    </CLASSES>
+-    <JAVADOC>
+-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11-javadoc.jar!/" />
+-    </JAVADOC>
+-    <SOURCES>
+-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11-sources.jar!/" />
+-    </SOURCES>
+-  </library>
+-</component>
+\ No newline at end of file
+Index: raoyin.iml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/raoyin.iml b/raoyin.iml
+deleted file mode 100644
+--- a/raoyin.iml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ /dev/null	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
+@@ -1,26 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+-  <component name="FacetManager">
+-    <facet type="web" name="Web">
+-      <configuration>
+-        <descriptors>
+-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+-        </descriptors>
+-        <webroots>
+-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+-        </webroots>
+-      </configuration>
+-    </facet>
+-  </component>
+-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+-    <output url="file://$MODULE_DIR$/target/classes" />
+-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+-    <content url="file://$MODULE_DIR$">
+-      <excludeFolder url="file://$MODULE_DIR$/target" />
+-    </content>
+-    <orderEntry type="inheritedJdk" />
+-    <orderEntry type="sourceFolder" forTests="false" />
+-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+-  </component>
+-</module>
+\ No newline at end of file
+Index: .idea/artifacts/raoyin_war.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><component name=\"ArtifactManager\">\r\n  <artifact type=\"war\" name=\"raoyin:war\">\r\n    <output-path>$PROJECT_DIR$/target</output-path>\r\n    <properties id=\"maven-jee-properties\">\r\n      <options>\r\n        <module>raoyin</module>\r\n        <packaging>war</packaging>\r\n      </options>\r\n    </properties>\r\n    <root id=\"archive\" name=\"raoyin.war\">\r\n      <element id=\"artifact\" artifact-name=\"raoyin:war exploded\" />\r\n    </root>\r\n  </artifact>\r\n</component>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/artifacts/raoyin_war.xml b/.idea/artifacts/raoyin_war.xml
+--- a/.idea/artifacts/raoyin_war.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/artifacts/raoyin_war.xml	(date 1640756746737)
+@@ -3,11 +3,13 @@
+     <output-path>$PROJECT_DIR$/target</output-path>
+     <properties id="maven-jee-properties">
+       <options>
++        <exploded>false</exploded>
+         <module>raoyin</module>
+         <packaging>war</packaging>
++        <unpackNestedArchives>false</unpackNestedArchives>
+       </options>
+     </properties>
+-    <root id="archive" name="raoyin.war">
++    <root id="archive" name="raoyin-1.0-SNAPSHOT.war">
+       <element id="artifact" artifact-name="raoyin:war exploded" />
+     </root>
+   </artifact>
+Index: .idea/artifacts/raoyin_war_exploded.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><component name=\"ArtifactManager\">\r\n  <artifact type=\"exploded-war\" name=\"raoyin:war exploded\">\r\n    <output-path>$PROJECT_DIR$/target/raoyin</output-path>\r\n    <properties id=\"maven-jee-properties\">\r\n      <options>\r\n        <exploded>true</exploded>\r\n        <module>raoyin</module>\r\n        <packaging>war</packaging>\r\n      </options>\r\n    </properties>\r\n    <root id=\"root\">\r\n      <element id=\"directory\" name=\"WEB-INF\">\r\n        <element id=\"directory\" name=\"classes\">\r\n          <element id=\"module-output\" name=\"raoyin\" />\r\n        </element>\r\n      </element>\r\n      <element id=\"directory\" name=\"META-INF\">\r\n        <element id=\"file-copy\" path=\"$PROJECT_DIR$/target/raoyin/META-INF/MANIFEST.MF\" />\r\n      </element>\r\n      <element id=\"javaee-facet-resources\" facet=\"raoyin/web/Web\" />\r\n    </root>\r\n  </artifact>\r\n</component>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/artifacts/raoyin_war_exploded.xml b/.idea/artifacts/raoyin_war_exploded.xml
+--- a/.idea/artifacts/raoyin_war_exploded.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/artifacts/raoyin_war_exploded.xml	(date 1640756746748)
+@@ -1,11 +1,12 @@
+ <component name="ArtifactManager">
+   <artifact type="exploded-war" name="raoyin:war exploded">
+-    <output-path>$PROJECT_DIR$/target/raoyin</output-path>
++    <output-path>$PROJECT_DIR$/target/raoyin-1.0-SNAPSHOT</output-path>
+     <properties id="maven-jee-properties">
+       <options>
+         <exploded>true</exploded>
+         <module>raoyin</module>
+         <packaging>war</packaging>
++        <unpackNestedArchives>false</unpackNestedArchives>
+       </options>
+     </properties>
+     <root id="root">
+@@ -13,9 +14,41 @@
+         <element id="directory" name="classes">
+           <element id="module-output" name="raoyin" />
+         </element>
++        <element id="directory" name="lib">
++          <element id="library" level="project" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:5.1.16.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-tx:5.1.16.RELEASE" />
++          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.9.2" />
++          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.27" />
++          <element id="library" level="project" name="Maven: com.google.protobuf:protobuf-java:3.11.4" />
++          <element id="library" level="project" name="Maven: com.alibaba:druid:1.2.0" />
++          <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.5.7" />
++          <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.3.3" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" />
++          <element id="library" level="project" name="Maven: org.opentest4j:opentest4j:1.2.0" />
++          <element id="library" level="project" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" />
++          <element id="library" level="project" name="Maven: org.apiguardian:apiguardian-api:1.1.2" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" />
++          <element id="library" level="project" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: javax.servlet:servlet-api:2.5" />
++          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.4" />
++          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" />
++          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" />
++          <element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.4" />
++          <element id="library" level="project" name="Maven: commons-io:commons-io:2.11.0" />
++        </element>
+       </element>
+       <element id="directory" name="META-INF">
+-        <element id="file-copy" path="$PROJECT_DIR$/target/raoyin/META-INF/MANIFEST.MF" />
++        <element id="file-copy" path="$PROJECT_DIR$/target/raoyin-1.0-SNAPSHOT/META-INF/MANIFEST.MF" />
+       </element>
+       <element id="javaee-facet-resources" facet="raoyin/web/Web" />
+     </root>
+Index: .idea/vcs.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=\"VcsDirectoryMappings\">\r\n<<<<<<< HEAD\r\n    <mapping directory=\"\" vcs=\"Git\" />\r\n=======\r\n    <mapping directory=\"$PROJECT_DIR$\" vcs=\"Git\" />\r\n>>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/vcs.xml b/.idea/vcs.xml
+--- a/.idea/vcs.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/vcs.xml	(date 1640756812989)
+@@ -1,10 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project version="4">
+   <component name="VcsDirectoryMappings">
+-<<<<<<< HEAD
+     <mapping directory="" vcs="Git" />
+-=======
+-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+->>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d
+   </component>
+ </project>
+\ No newline at end of file
+Index: .idea/modules.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=\"ProjectModuleManager\">\r\n    <modules>\r\n<<<<<<< HEAD\r\n      <module fileurl=\"file://$PROJECT_DIR$/.idea/Raoying.iml\" filepath=\"$PROJECT_DIR$/.idea/Raoying.iml\" />\r\n=======\r\n      <module fileurl=\"file://$PROJECT_DIR$/raoyin.iml\" filepath=\"$PROJECT_DIR$/raoyin.iml\" />\r\n>>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d\r\n    </modules>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/modules.xml b/.idea/modules.xml
+--- a/.idea/modules.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/modules.xml	(date 1640756746728)
+@@ -2,11 +2,7 @@
+ <project version="4">
+   <component name="ProjectModuleManager">
+     <modules>
+-<<<<<<< HEAD
+-      <module fileurl="file://$PROJECT_DIR$/.idea/Raoying.iml" filepath="$PROJECT_DIR$/.idea/Raoying.iml" />
+-=======
+       <module fileurl="file://$PROJECT_DIR$/raoyin.iml" filepath="$PROJECT_DIR$/raoyin.iml" />
+->>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d
+     </modules>
+   </component>
+ </project>
+\ No newline at end of file

+ 241 - 0
.idea/shelf/在进行更新之前于_2021_12_29_13_47_取消提交了变更_[变更]/shelved.patch

@@ -0,0 +1,241 @@
+Index: .idea/compiler.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=\"CompilerConfiguration\">\r\n    <annotationProcessing>\r\n      <profile name=\"Maven default annotation processors profile\" enabled=\"true\">\r\n        <sourceOutputDir name=\"target/generated-sources/annotations\" />\r\n        <sourceTestOutputDir name=\"target/generated-test-sources/test-annotations\" />\r\n        <outputRelativeToContentRoot value=\"true\" />\r\n        <module name=\"raoyin\" />\r\n      </profile>\r\n    </annotationProcessing>\r\n    <bytecodeTargetLevel>\r\n      <module name=\"raoyin\" target=\"1.7\" />\r\n    </bytecodeTargetLevel>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/compiler.xml b/.idea/compiler.xml
+--- a/.idea/compiler.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/compiler.xml	(date 1640756854834)
+@@ -10,7 +10,7 @@
+       </profile>
+     </annotationProcessing>
+     <bytecodeTargetLevel>
+-      <module name="raoyin" target="1.7" />
++      <module name="raoyin" target="1.8" />
+     </bytecodeTargetLevel>
+   </component>
+ </project>
+\ No newline at end of file
+Index: .idea/libraries/Maven__junit_junit_4_11.xml
+===================================================================
+diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml
+deleted file mode 100644
+--- a/.idea/libraries/Maven__junit_junit_4_11.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ /dev/null	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
+@@ -1,13 +0,0 @@
+-<component name="libraryTable">
+-  <library name="Maven: junit:junit:4.11">
+-    <CLASSES>
+-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11.jar!/" />
+-    </CLASSES>
+-    <JAVADOC>
+-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11-javadoc.jar!/" />
+-    </JAVADOC>
+-    <SOURCES>
+-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11-sources.jar!/" />
+-    </SOURCES>
+-  </library>
+-</component>
+\ No newline at end of file
+Index: .idea/artifacts/raoyin_war.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><component name=\"ArtifactManager\">\r\n  <artifact type=\"war\" name=\"raoyin:war\">\r\n    <output-path>$PROJECT_DIR$/target</output-path>\r\n    <properties id=\"maven-jee-properties\">\r\n      <options>\r\n        <module>raoyin</module>\r\n        <packaging>war</packaging>\r\n      </options>\r\n    </properties>\r\n    <root id=\"archive\" name=\"raoyin.war\">\r\n      <element id=\"artifact\" artifact-name=\"raoyin:war exploded\" />\r\n    </root>\r\n  </artifact>\r\n</component>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/artifacts/raoyin_war.xml b/.idea/artifacts/raoyin_war.xml
+--- a/.idea/artifacts/raoyin_war.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/artifacts/raoyin_war.xml	(date 1640756854794)
+@@ -3,11 +3,13 @@
+     <output-path>$PROJECT_DIR$/target</output-path>
+     <properties id="maven-jee-properties">
+       <options>
++        <exploded>false</exploded>
+         <module>raoyin</module>
+         <packaging>war</packaging>
++        <unpackNestedArchives>false</unpackNestedArchives>
+       </options>
+     </properties>
+-    <root id="archive" name="raoyin.war">
++    <root id="archive" name="raoyin-1.0-SNAPSHOT.war">
+       <element id="artifact" artifact-name="raoyin:war exploded" />
+     </root>
+   </artifact>
+Index: .idea/artifacts/raoyin_war_exploded.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><component name=\"ArtifactManager\">\r\n  <artifact type=\"exploded-war\" name=\"raoyin:war exploded\">\r\n    <output-path>$PROJECT_DIR$/target/raoyin</output-path>\r\n    <properties id=\"maven-jee-properties\">\r\n      <options>\r\n        <exploded>true</exploded>\r\n        <module>raoyin</module>\r\n        <packaging>war</packaging>\r\n      </options>\r\n    </properties>\r\n    <root id=\"root\">\r\n      <element id=\"directory\" name=\"WEB-INF\">\r\n        <element id=\"directory\" name=\"classes\">\r\n          <element id=\"module-output\" name=\"raoyin\" />\r\n        </element>\r\n      </element>\r\n      <element id=\"directory\" name=\"META-INF\">\r\n        <element id=\"file-copy\" path=\"$PROJECT_DIR$/target/raoyin/META-INF/MANIFEST.MF\" />\r\n      </element>\r\n      <element id=\"javaee-facet-resources\" facet=\"raoyin/web/Web\" />\r\n    </root>\r\n  </artifact>\r\n</component>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/artifacts/raoyin_war_exploded.xml b/.idea/artifacts/raoyin_war_exploded.xml
+--- a/.idea/artifacts/raoyin_war_exploded.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/artifacts/raoyin_war_exploded.xml	(date 1640756854813)
+@@ -1,11 +1,12 @@
+ <component name="ArtifactManager">
+   <artifact type="exploded-war" name="raoyin:war exploded">
+-    <output-path>$PROJECT_DIR$/target/raoyin</output-path>
++    <output-path>$PROJECT_DIR$/target/raoyin-1.0-SNAPSHOT</output-path>
+     <properties id="maven-jee-properties">
+       <options>
+         <exploded>true</exploded>
+         <module>raoyin</module>
+         <packaging>war</packaging>
++        <unpackNestedArchives>false</unpackNestedArchives>
+       </options>
+     </properties>
+     <root id="root">
+@@ -13,9 +14,41 @@
+         <element id="directory" name="classes">
+           <element id="module-output" name="raoyin" />
+         </element>
++        <element id="directory" name="lib">
++          <element id="library" level="project" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:5.1.16.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-tx:5.1.16.RELEASE" />
++          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.9.2" />
++          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.27" />
++          <element id="library" level="project" name="Maven: com.google.protobuf:protobuf-java:3.11.4" />
++          <element id="library" level="project" name="Maven: com.alibaba:druid:1.2.0" />
++          <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.5.7" />
++          <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.3.3" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" />
++          <element id="library" level="project" name="Maven: org.opentest4j:opentest4j:1.2.0" />
++          <element id="library" level="project" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" />
++          <element id="library" level="project" name="Maven: org.apiguardian:apiguardian-api:1.1.2" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" />
++          <element id="library" level="project" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" />
++          <element id="library" level="project" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" />
++          <element id="library" level="project" name="Maven: javax.servlet:servlet-api:2.5" />
++          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.4" />
++          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" />
++          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" />
++          <element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.4" />
++          <element id="library" level="project" name="Maven: commons-io:commons-io:2.11.0" />
++        </element>
+       </element>
+       <element id="directory" name="META-INF">
+-        <element id="file-copy" path="$PROJECT_DIR$/target/raoyin/META-INF/MANIFEST.MF" />
++        <element id="file-copy" path="$PROJECT_DIR$/target/raoyin-1.0-SNAPSHOT/META-INF/MANIFEST.MF" />
+       </element>
+       <element id="javaee-facet-resources" facet="raoyin/web/Web" />
+     </root>
+Index: .idea/vcs.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=\"VcsDirectoryMappings\">\r\n<<<<<<< HEAD\r\n    <mapping directory=\"\" vcs=\"Git\" />\r\n=======\r\n    <mapping directory=\"$PROJECT_DIR$\" vcs=\"Git\" />\r\n>>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/vcs.xml b/.idea/vcs.xml
+--- a/.idea/vcs.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/vcs.xml	(date 1640756854845)
+@@ -1,10 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project version="4">
+   <component name="VcsDirectoryMappings">
+-<<<<<<< HEAD
+-    <mapping directory="" vcs="Git" />
+-=======
+     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+->>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d
+   </component>
+ </project>
+\ No newline at end of file
+Index: .idea/modules.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=\"ProjectModuleManager\">\r\n    <modules>\r\n<<<<<<< HEAD\r\n      <module fileurl=\"file://$PROJECT_DIR$/.idea/Raoying.iml\" filepath=\"$PROJECT_DIR$/.idea/Raoying.iml\" />\r\n=======\r\n      <module fileurl=\"file://$PROJECT_DIR$/raoyin.iml\" filepath=\"$PROJECT_DIR$/raoyin.iml\" />\r\n>>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d\r\n    </modules>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/modules.xml b/.idea/modules.xml
+--- a/.idea/modules.xml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/.idea/modules.xml	(date 1640756854773)
+@@ -2,11 +2,7 @@
+ <project version="4">
+   <component name="ProjectModuleManager">
+     <modules>
+-<<<<<<< HEAD
+-      <module fileurl="file://$PROJECT_DIR$/.idea/Raoying.iml" filepath="$PROJECT_DIR$/.idea/Raoying.iml" />
+-=======
+       <module fileurl="file://$PROJECT_DIR$/raoyin.iml" filepath="$PROJECT_DIR$/raoyin.iml" />
+->>>>>>> f2e35dc378c9ee33ead6e94a1c1e28cdc0274a5d
+     </modules>
+   </component>
+ </project>
+\ No newline at end of file
+Index: raoyin.iml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule=\"true\" type=\"JAVA_MODULE\" version=\"4\">\r\n  <component name=\"FacetManager\">\r\n    <facet type=\"web\" name=\"Web\">\r\n      <configuration>\r\n        <descriptors>\r\n          <deploymentDescriptor name=\"web.xml\" url=\"file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml\" />\r\n        </descriptors>\r\n        <webroots>\r\n          <root url=\"file://$MODULE_DIR$/src/main/webapp\" relative=\"/\" />\r\n        </webroots>\r\n      </configuration>\r\n    </facet>\r\n  </component>\r\n  <component name=\"NewModuleRootManager\" LANGUAGE_LEVEL=\"JDK_1_7\">\r\n    <output url=\"file://$MODULE_DIR$/target/classes\" />\r\n    <output-test url=\"file://$MODULE_DIR$/target/test-classes\" />\r\n    <content url=\"file://$MODULE_DIR$\">\r\n      <excludeFolder url=\"file://$MODULE_DIR$/target\" />\r\n    </content>\r\n    <orderEntry type=\"inheritedJdk\" />\r\n    <orderEntry type=\"sourceFolder\" forTests=\"false\" />\r\n    <orderEntry type=\"library\" scope=\"TEST\" name=\"Maven: junit:junit:4.11\" level=\"project\" />\r\n    <orderEntry type=\"library\" scope=\"TEST\" name=\"Maven: org.hamcrest:hamcrest-core:1.3\" level=\"project\" />\r\n  </component>\r\n</module>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/raoyin.iml b/raoyin.iml
+--- a/raoyin.iml	(revision d61fa96dde90f1fac85b566366a9ac7b0c11a6de)
++++ b/raoyin.iml	(date 1640756854490)
+@@ -11,8 +11,11 @@
+         </webroots>
+       </configuration>
+     </facet>
++    <facet type="Spring" name="Spring">
++      <configuration />
++    </facet>
+   </component>
+-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
++  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+     <output url="file://$MODULE_DIR$/target/classes" />
+     <output-test url="file://$MODULE_DIR$/target/test-classes" />
+     <content url="file://$MODULE_DIR$">
+@@ -20,7 +23,37 @@
+     </content>
+     <orderEntry type="inheritedJdk" />
+     <orderEntry type="sourceFolder" forTests="false" />
+-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.16.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.16.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
++    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.27" level="project" />
++    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.11.4" level="project" />
++    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.0" level="project" />
++    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
++    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.3" level="project" />
++    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
+     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
++    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
++    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
++    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
++    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
++    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
++    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
++    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
++    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
++    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
++    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.4" level="project" />
++    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
++    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
++    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
++    <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
+   </component>
+ </module>
+\ No newline at end of file

+ 163 - 0
.idea/workspace.xml

@@ -0,0 +1,163 @@
+<?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="0e73f9ce-e579-4dde-9c5a-5dcc9ebae806" name="变更" comment="">
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Goods.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Goods.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/GoodsMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/GoodsMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Selection.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Selection.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/SelectionMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/SelectionMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Store.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Store.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/StoreMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/StoreMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Useraccount.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Useraccount.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountKey.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountKey.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountMapper.class" 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="ComposerSettings">
+    <execution />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="22u1yH5L9f9u9JHqDRvD3843aDh" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../桌面/shop-master" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+  </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="0e73f9ce-e579-4dde-9c5a-5dcc9ebae806" name="变更" comment="" />
+      <created>1640672914324</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1640672914324</updated>
+      <workItem from="1640672916730" duration="2121000" />
+      <workItem from="1640675271656" duration="4551000" />
+      <workItem from="1640701294927" duration="278000" />
+      <workItem from="1640756371703" duration="371000" />
+      <workItem from="1640756789641" duration="7797000" />
+    </task>
+    <task id="LOCAL-00001" summary="1">
+      <created>1640756954996</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1640756954996</updated>
+    </task>
+    <task id="LOCAL-00002" summary="1">
+      <created>1640757426683</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1640757426683</updated>
+    </task>
+    <task id="LOCAL-00003" summary="1">
+      <created>1640757596322</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1640757596322</updated>
+    </task>
+    <task id="LOCAL-00004" summary="1">
+      <created>1640757747533</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1640757747533</updated>
+    </task>
+    <task id="LOCAL-00005" summary="1">
+      <created>1640758198329</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1640758198329</updated>
+    </task>
+    <task id="LOCAL-00006" summary="1">
+      <created>1640758370904</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1640758370904</updated>
+    </task>
+    <task id="LOCAL-00007" summary="1">
+      <created>1640762244433</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1640762244433</updated>
+    </task>
+    <task id="LOCAL-00008" summary="122">
+      <created>1640763861810</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1640763861810</updated>
+    </task>
+    <task id="LOCAL-00009" summary="122">
+      <created>1640765443836</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1640765443836</updated>
+    </task>
+    <task id="LOCAL-00010" summary="122">
+      <created>1640765600855</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1640765600855</updated>
+    </task>
+    <task id="LOCAL-00011" summary="122">
+      <created>1640765809810</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1640765809810</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="1" />
+    <MESSAGE value="122" />
+    <option name="LAST_COMMIT_MESSAGE" value="122" />
+  </component>
+</project>

+ 78 - 0
target/classes/DataBase.sql

@@ -0,0 +1,78 @@
+drop database if exists ShoppingWebsite;
+create database if not exists ShoppingWebsite;
+use ShoppingWebsite;
+
+
+
+
+/*  node*/
+create table if not exists nodeinfo
+(
+    id bigint not null primary key,
+    prev_id bigint null,
+    next_id bigint null,
+    parent_id bigint null,
+    child_id bigint null,
+    obj_type varchar(100) default 'group04.BasicNode'
+);
+
+/*  node stuctor
+    userAccount
+    +   cart
+        +   user_cart[]
+    +   collect
+        +   goods[]
+*/
+create table if not exists userAccount
+(
+    userId bigint not null,
+    email varchar(50) not null,
+    password varchar(16) not null,
+    permission int not null default 0,
+    primary key(email,userId)
+);
+
+/*goods*/
+create table if not exists user_cart
+(
+    user_Cart_Id bigint not null primary key,
+    count int not null,
+);
+
+/*  node stuctor
+    store
+    +   goods[]
+        +   selections
+            +   selectionGroup[]
+                +   selection[]
+        +   comments
+            +   comment[]
+*/
+create table if not exists store
+(
+    store_Id bigint not null primary key,
+    postion varchar(100) not null,
+    name varchar(50) not null,
+    star int
+);
+
+create table if not exists goods
+(
+    goods_id bigint not null primary key,
+    postion varchar(100) not null,
+    name varchar(50) not null,
+    star int
+);
+
+create table if not exists selection_group
+(
+    selection_group_id bigint not null primary key,
+    name varchar(50) not null
+);
+
+create table if not exists selection
+(
+    selection_id bigint not null primary key,
+    name varchar(50) not null,
+    price float(13,2)
+);

+ 31 - 0
target/classes/MyBatis-config.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <settings>
+        <setting name="mapUnderscoreToCamelCase" value="true"/>
+    </settings>
+<!--    <typeAliases>-->
+<!--        <package name="myBatisTest.myBatis"/>-->
+<!--    </typeAliases>-->
+<!--    <environments default="development">-->
+<!--        <environment id="development">-->
+<!--            <transactionManager type="JDBC"/>-->
+<!--            <dataSource type="POOLED">-->
+<!--                <property name="driver" value="com.mysql.jdbc.Driver"/>-->
+<!--                <property name="url" value="jdbc:mysql://localhost:3306/user"/>-->
+<!--                <property name="username" value="root"/>-->
+<!--                <property name="password" value="123456"/>-->
+<!--            </dataSource>-->
+<!--        </environment>-->
+<!--    </environments>-->
+    <mappers>
+        <mapper resource="myBatisMap/GoodsMapper.xml"/>
+        <mapper resource="myBatisMap/NodeinfoMapper.xml"/>
+        <mapper resource="myBatisMap/SelectionMapper.xml"/>
+        <mapper resource="myBatisMap/StoreMapper.xml"/>
+        <mapper resource="myBatisMap/UseraccountMapper.xml"/>
+<!--        <mapper resource="StuMapper.xml"/>-->
+    </mappers>
+</configuration>

+ 4 - 0
target/classes/db.properties

@@ -0,0 +1,4 @@
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost:3306/ShoppingWebsite
+jdbc.username=root
+jdbc.password=123456

+ 83 - 0
target/classes/generatorConfig.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE generatorConfiguration PUBLIC
+        "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+    <classPathEntry location="C:\Users\16096\.m2\repository\mysql\mysql-connector-java\8.0.23\mysql-connector-java-8.0.23.jar"/>
+    <context id="context" targetRuntime="MyBatis3">
+        <commentGenerator>
+            <property name="suppressAllComment" value="false"/>
+            <property name="suppressDate" value="true"/>
+        </commentGenerator>
+        <jdbcConnection
+                driverClass="com.mysql.jdbc.Driver"
+                connectionURL="jdbc:mysql://localhost:3306/ShoppingWebsite"
+                userId="root"
+                password="123456"
+        />
+        <javaTypeResolver>
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+
+        <javaModelGenerator targetPackage="WebsiteES.myBatis" targetProject="src/main/java">
+            <property name="enableSubPackages" value="true"/>
+            <property name="trimStrings" value="false"/>
+        </javaModelGenerator>
+
+        <sqlMapGenerator targetPackage="myBatisMap" targetProject="src/main/resources">
+            <property name="enableSubPackages" value="true"/>
+        </sqlMapGenerator>
+
+        <javaClientGenerator targetPackage="WebsiteES.myBatis" targetProject="src/main/java" type="XMLMAPPER">
+            <property name="enableSubPackages" value="true"/>
+        </javaClientGenerator>
+
+        <table
+                tableName="userAccount"
+        enableCountByExample="false"
+        enableDeleteByExample="false"
+        enableSelectByExample="false"
+        enableUpdateByExample="false"
+        />
+
+        <table
+                tableName="user_cart"
+        enableCountByExample="false"
+        enableDeleteByExample="false"
+        enableSelectByExample="false"
+        enableUpdateByExample="false"
+        />
+
+        <table
+                tableName="store"
+        enableCountByExample="false"
+        enableDeleteByExample="false"
+        enableSelectByExample="false"
+        enableUpdateByExample="false"
+        />
+
+        <table
+                tableName="goods"
+        enableCountByExample="false"
+        enableDeleteByExample="false"
+        enableSelectByExample="false"
+        enableUpdateByExample="false"
+        />
+
+        <table
+                tableName="selectionGroup"
+        enableCountByExample="false"
+        enableDeleteByExample="false"
+        enableSelectByExample="false"
+        enableUpdateByExample="false"
+        />
+
+        <table
+                tableName="selection"
+        enableCountByExample="false"
+        enableDeleteByExample="false"
+        enableSelectByExample="false"
+        enableUpdateByExample="false"
+        />
+    </context>
+</generatorConfiguration>

+ 114 - 0
target/classes/myBatisMap/GoodsMapper.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="WebsiteES.myBatis.GoodsMapper" >
+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.Goods" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="goods_id" property="goodsId" jdbcType="BIGINT" />
+    <result column="postion" property="postion" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="star" property="star" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    goods_id, postion, name, star
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from goods
+    where goods_id = #{goodsId,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from goods
+    where goods_id = #{goodsId,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="WebsiteES.myBatis.Goods" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into goods (goods_id, postion, name, 
+      star)
+    values (#{goodsId,jdbcType=BIGINT}, #{postion,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{star,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.Goods" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into goods
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="goodsId != null" >
+        goods_id,
+      </if>
+      <if test="postion != null" >
+        postion,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="star != null" >
+        star,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="goodsId != null" >
+        #{goodsId,jdbcType=BIGINT},
+      </if>
+      <if test="postion != null" >
+        #{postion,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="star != null" >
+        #{star,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.Goods" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update goods
+    <set >
+      <if test="postion != null" >
+        postion = #{postion,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="star != null" >
+        star = #{star,jdbcType=INTEGER},
+      </if>
+    </set>
+    where goods_id = #{goodsId,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.Goods" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update goods
+    set postion = #{postion,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      star = #{star,jdbcType=INTEGER}
+    where goods_id = #{goodsId,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 141 - 0
target/classes/myBatisMap/NodeinfoMapper.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="group04.myBatis.NodeinfoMapper" >
+  <resultMap id="BaseResultMap" type="group04.myBatis.Nodeinfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" property="id" jdbcType="BIGINT" />
+    <result column="prev_id" property="prevId" jdbcType="BIGINT" />
+    <result column="next_id" property="nextId" jdbcType="BIGINT" />
+    <result column="parent_id" property="parentId" jdbcType="BIGINT" />
+    <result column="child_id" property="childId" jdbcType="BIGINT" />
+    <result column="obj_type" property="objType" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, prev_id, next_id, parent_id, child_id, obj_type
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from nodeinfo
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from nodeinfo
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="group04.myBatis.Nodeinfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into nodeinfo (id, prev_id, next_id, 
+      parent_id, child_id, obj_type
+      )
+    values (#{id,jdbcType=BIGINT}, #{prevId,jdbcType=BIGINT}, #{nextId,jdbcType=BIGINT}, 
+      #{parentId,jdbcType=BIGINT}, #{childId,jdbcType=BIGINT}, #{objType,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="group04.myBatis.Nodeinfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into nodeinfo
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="prevId != null" >
+        prev_id,
+      </if>
+      <if test="nextId != null" >
+        next_id,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="childId != null" >
+        child_id,
+      </if>
+      <if test="objType != null" >
+        obj_type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="prevId != null" >
+        #{prevId,jdbcType=BIGINT},
+      </if>
+      <if test="nextId != null" >
+        #{nextId,jdbcType=BIGINT},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="childId != null" >
+        #{childId,jdbcType=BIGINT},
+      </if>
+      <if test="objType != null" >
+        #{objType,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="group04.myBatis.Nodeinfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update nodeinfo
+    <set >
+      <if test="prevId != null" >
+        prev_id = #{prevId,jdbcType=BIGINT},
+      </if>
+      <if test="nextId != null" >
+        next_id = #{nextId,jdbcType=BIGINT},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="childId != null" >
+        child_id = #{childId,jdbcType=BIGINT},
+      </if>
+      <if test="objType != null" >
+        obj_type = #{objType,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="group04.myBatis.Nodeinfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update nodeinfo
+    set prev_id = #{prevId,jdbcType=BIGINT},
+      next_id = #{nextId,jdbcType=BIGINT},
+      parent_id = #{parentId,jdbcType=BIGINT},
+      child_id = #{childId,jdbcType=BIGINT},
+      obj_type = #{objType,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="commit">
+    commit
+  </update>
+</mapper>

+ 103 - 0
target/classes/myBatisMap/SelectionMapper.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="WebsiteES.myBatis.SelectionMapper" >
+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.Selection" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="selection_id" property="selectionId" jdbcType="BIGINT" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="price" property="price" jdbcType="REAL" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    selection_id, name, price
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from selection
+    where selection_id = #{selectionId,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from selection
+    where selection_id = #{selectionId,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="WebsiteES.myBatis.Selection" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into selection (selection_id, name, price
+      )
+    values (#{selectionId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{price,jdbcType=REAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.Selection" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into selection
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="selectionId != null" >
+        selection_id,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="price != null" >
+        price,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="selectionId != null" >
+        #{selectionId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null" >
+        #{price,jdbcType=REAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.Selection" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update selection
+    <set >
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null" >
+        price = #{price,jdbcType=REAL},
+      </if>
+    </set>
+    where selection_id = #{selectionId,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.Selection" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update selection
+    set name = #{name,jdbcType=VARCHAR},
+      price = #{price,jdbcType=REAL}
+    where selection_id = #{selectionId,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 59 - 0
target/classes/myBatisMap/StoreMapper.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="WebsiteES.myBatis.StoreMapper">
+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.Store">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <result column="store_id" jdbcType="TINYINT" property="storeId" />
+    <result column="manager_staff_id" jdbcType="TINYINT" property="managerStaffId" />
+    <result column="address_id" jdbcType="SMALLINT" property="addressId" />
+    <result column="last_update" jdbcType="TIMESTAMP" property="lastUpdate" />
+  </resultMap>
+  <insert id="insert" parameterType="WebsiteES.myBatis.Store">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into store (store_id, manager_staff_id, address_id, 
+      last_update)
+    values (#{storeId,jdbcType=TINYINT}, #{managerStaffId,jdbcType=TINYINT}, #{addressId,jdbcType=SMALLINT}, 
+      #{lastUpdate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.Store">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into store
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="storeId != null">
+        store_id,
+      </if>
+      <if test="managerStaffId != null">
+        manager_staff_id,
+      </if>
+      <if test="addressId != null">
+        address_id,
+      </if>
+      <if test="lastUpdate != null">
+        last_update,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="storeId != null">
+        #{storeId,jdbcType=TINYINT},
+      </if>
+      <if test="managerStaffId != null">
+        #{managerStaffId,jdbcType=TINYINT},
+      </if>
+      <if test="addressId != null">
+        #{addressId,jdbcType=SMALLINT},
+      </if>
+      <if test="lastUpdate != null">
+        #{lastUpdate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+</mapper>

+ 114 - 0
target/classes/myBatisMap/UseraccountMapper.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="WebsiteES.myBatis.UseraccountMapper" >
+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.Useraccount" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="email" property="email" jdbcType="VARCHAR" />
+    <id column="userId" property="userid" jdbcType="BIGINT" />
+    <result column="password" property="password" jdbcType="VARCHAR" />
+    <result column="permission" property="permission" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    email, userId, password, permission
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="WebsiteES.myBatis.UseraccountKey" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from useraccount
+    where email = #{email,jdbcType=VARCHAR}
+      and userId = #{userid,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="WebsiteES.myBatis.UseraccountKey" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from useraccount
+    where email = #{email,jdbcType=VARCHAR}
+      and userId = #{userid,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="WebsiteES.myBatis.Useraccount" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into useraccount (email, userId, password, 
+      permission)
+    values (#{email,jdbcType=VARCHAR}, #{userid,jdbcType=BIGINT}, #{password,jdbcType=VARCHAR}, 
+      #{permission,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.Useraccount" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into useraccount
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="email != null" >
+        email,
+      </if>
+      <if test="userid != null" >
+        userId,
+      </if>
+      <if test="password != null" >
+        password,
+      </if>
+      <if test="permission != null" >
+        permission,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="email != null" >
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null" >
+        #{userid,jdbcType=BIGINT},
+      </if>
+      <if test="password != null" >
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="permission != null" >
+        #{permission,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.Useraccount" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update useraccount
+    <set >
+      <if test="password != null" >
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="permission != null" >
+        permission = #{permission,jdbcType=INTEGER},
+      </if>
+    </set>
+    where email = #{email,jdbcType=VARCHAR}
+      and userId = #{userid,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.Useraccount" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update useraccount
+    set password = #{password,jdbcType=VARCHAR},
+      permission = #{permission,jdbcType=INTEGER}
+    where email = #{email,jdbcType=VARCHAR}
+      and userId = #{userid,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 61 - 0
target/classes/springmvc-config.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:mvc="http://www.springframework.org/schema/mvc"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="
+    http://www.springframework.org/schema/beans
+    http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context
+    http://www.springframework.org/schema/context/spring-context.xsd
+    http://www.springframework.org/schema/mvc
+    http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+    <context:property-placeholder location="classpath:db.properties"/>
+
+    <context:component-scan base-package="group04"/>
+    <context:component-scan base-package="WebsiteES"/>
+
+    <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">
+        <property name="driverClassName" value="${jdbc.driver}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.username}"/>
+        <property name="password"  value="${jdbc.password}"/>
+    </bean>
+
+    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+        <property name="dataSource" ref="dataSource" />
+        <property name="configLocation" value="classpath:MyBatis-config.xml"/>
+    </bean>
+
+    <!--MyBatis Mapper FactoryBean-->
+    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+        <property name="basePackage" value="group04.myBatis"/>
+    </bean>
+
+    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+        <property name="basePackage" value="WebsiteES.myBatis"/>
+    </bean>
+
+    <!--Spring MVC.....(for primary web service)-->
+    <!-- <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix" value = "/"/>
+        <property name="suffix" value = ".jsp"/>
+    </bean> -->
+
+    <!-- should add multipartResolver to use  -->
+    <!-- <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+        <property name="defaultEncoding" value="utf-8"/>
+        <property name="maxUploadSize" value="2097152"/>
+    </bean> -->
+
+    <!-- <mvc:annotation-driven/>
+    <mvc:default-servlet-handler/> -->
+    <!--    <mvc:interceptors>-->
+    <!--        <mvc:interceptor>-->
+    <!--            <mvc:mapping path="/*"/>-->
+    <!--            <mvc:exclude-mapping path="/LoginPage"/>-->
+    <!--            <bean id="InterceptorLogin" class="MVCTry.InterceptorLogin"/>-->
+    <!--        </mvc:interceptor>-->
+    <!--    </mvc:interceptors>-->
+</beans>

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů