3 コミット e3d16e56ba ... 59bdc7914d

作者 SHA1 メッセージ 日付
  wei 59bdc7914d Merge remote-tracking branch 'origin/master' 3 年 前
  wei 7b30800aef HTML 3 年 前
  wei 6494db6059 HTML 3 年 前
17 ファイル変更312 行追加0 行削除
  1. 18 0
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_29_16_37_[Default_Changelist]/shelved.patch
  2. 4 0
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_29_16_37__Default_Changelist_.xml
  3. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Goods.class
  4. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/GoodsMapper.class
  5. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Selection.class
  6. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/SelectionMapper.class
  7. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Store.class
  8. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/StoreMapper.class
  9. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Useraccount.class
  10. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/UseraccountKey.class
  11. BIN
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/UseraccountMapper.class
  12. 2 0
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/debug.log
  13. 18 0
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/shelved.patch
  14. 54 0
      .idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14__Default_Changelist_.xml
  15. 75 0
      .idea/workspace.xml
  16. BIN
      target/classes/WebsiteES/myBatis/GoodsMapper.class
  17. 141 0
      target/classes/myBatisMap/NodeinfoMapper.xml

+ 18 - 0
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_29_16_37_[Default_Changelist]/shelved.patch

@@ -0,0 +1,18 @@
+Index: .idea/runConfigurations.xml
+===================================================================
+diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
+deleted file mode 100644
+--- a/.idea/runConfigurations.xml	(revision bcf91a698fb7ce2fcd4d39cf8b4ae68bd31dcc9e)
++++ /dev/null	(revision bcf91a698fb7ce2fcd4d39cf8b4ae68bd31dcc9e)
+@@ -1,10 +0,0 @@
+-<?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

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

@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_2021_12_29_16_37_[Default_Changelist]" date="1640767049811" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_29_16_37_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2021/12/29 16:37 [Default Changelist]" />
+</changelist>

BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Goods.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/GoodsMapper.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Selection.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/SelectionMapper.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Store.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/StoreMapper.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Useraccount.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/UseraccountKey.class


BIN
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/UseraccountMapper.class


+ 2 - 0
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/debug.log

@@ -0,0 +1,2 @@
+[1227/230423.623:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1229/222103.310:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

+ 18 - 0
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/shelved.patch

@@ -0,0 +1,18 @@
+Index: .idea/runConfigurations.xml
+===================================================================
+diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
+deleted file mode 100644
+--- a/.idea/runConfigurations.xml	(revision 4e545060a030d02f28a642d8093341f81f6635fe)
++++ /dev/null	(revision 4e545060a030d02f28a642d8093341f81f6635fe)
+@@ -1,10 +0,0 @@
+-<?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

+ 54 - 0
.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14__Default_Changelist_.xml

@@ -0,0 +1,54 @@
+<changelist name="Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]" date="1640848481879" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2021/12/30 15:14 [Default Changelist]" />
+  <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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/GoodsMapper.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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/StoreMapper.class" />
+  </binary>
+  <binary>
+    <option name="BEFORE_PATH" value="src/main/webapp/debug.log" />
+    <option name="AFTER_PATH" value="src/main/webapp/debug.log" />
+    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/debug.log" />
+  </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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/UseraccountKey.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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/UseraccountMapper.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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Store.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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/SelectionMapper.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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Goods.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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Selection.class" />
+  </binary>
+  <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/Uncommitted_changes_before_Update_at_2021_12_30_15_14_[Default_Changelist]/Useraccount.class" />
+  </binary>
+</changelist>

+ 75 - 0
.idea/workspace.xml

@@ -0,0 +1,75 @@
+<?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="84c8d623-cca5-43bb-85a8-242b705dd4be" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/WebApp.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/WebApp.class" afterDir="false" />
+      <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" />
+      <change beforePath="$PROJECT_DIR$/target/classes/group04/myBatis/Nodeinfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/group04/myBatis/Nodeinfo.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/group04/myBatis/NodeinfoMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/group04/myBatis/NodeinfoMapper.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="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="22rT0ZxNg62hjbvh9q0Zv7FsSik" />
+  <component name="ProjectViewState">
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="jdk.selected.JAVA_MODULE" value="15" />
+    <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="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="84c8d623-cca5-43bb-85a8-242b705dd4be" name="Default Changelist" comment="" />
+      <created>1640594486664</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1640594486664</updated>
+      <workItem from="1640594489289" duration="1828000" />
+      <workItem from="1640765989014" duration="1991000" />
+      <workItem from="1640843215429" duration="425000" />
+      <workItem from="1640845222643" duration="9000" />
+      <workItem from="1640848253156" duration="397000" />
+    </task>
+    <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>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+</project>

BIN
target/classes/WebsiteES/myBatis/GoodsMapper.class


+ 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>