пре 3 година · 53c6d14e3a
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +0,0 @@
 
				-{
			
 
				-    "java.configuration.updateBuildConfiguration": "interactive"
			
 
				-}
			
--- a/12.html
+++ b/12.html
@@ -1,94 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-<base href="<%=basePath%>">
			
 
				-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			
 
				-<title>慢步时尚广场</title>
			
 
				-<link href="css/style.css" rel="stylesheet" type="text/css">
			
 
				-<style type="text/css">
			
 
				-    .focusBox {
			
 
				-        position: absolute;
			
 
				-        top: 490px;
			
 
				-        width: 120px;
			
 
				-        left: 50%;
			
 
				-        margin-left: -60px;
			
 
				-        list-style: none;
			
 
				-    }
			
 
				-
			
 
				-    .focusBox li {
			
 
				-        float: left;
			
 
				-        margin-right: 10px;
			
 
				-        width: 15px;
			
 
				-        height: 15px;
			
 
				-        border-radius: gray;
			
 
				-        cursor: pointer;
			
 
				-    }
			
 
				-
			
 
				-    .focusBox li.cur {
			
 
				-        background: #f60;
			
 
				-        opacity: 0.6;
			
 
				-        filter: alpha(opacity=60);
			
 
				-    }
			
 
				-    </style>
			
 
				-    <script type="text/javascript" src="js/pictureSlide.js"></script>
			
 
				-</head>
			
 
				-<body>
			
 
				-<!-- logo和banner start -->
			
 
				-<table width="1200" border="0" cellspacing="0" cellpadding="0" align="center">
			
 
				-    <tr>
			
 
				-        <td height="95"><a href="index"><images/logo.jpg></a></td>
			
 
				-        <td align="right"><img src="images/banner.jpg"></td>
			
 
				-    </tr>
			
 
				-</table>
			
 
				-<!-- logo和banner end -->
			
 
				-<!-- 菜单导航 start -->
			
 
				-<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#ce2626">
			
 
				-    <tr>
			
 
				-        <td width="200">&nbsp;</td>
			
 
				-        <td width="80" align="center" class="nav_active"><a href="<%=basePath%>/index" class="while">首页</a></td>
			
 
				-        <td width="100" align="center"><a href="<%=basePath%>/showNew" class="white">最新上架</a></td>
			
 
				-        <td width="100" align="center">品牌活动</td>
			
 
				-        <td width="100" align="center">原厂直供</td>
			
 
				-        <td width="80" align="center">团购</td>
			
 
				-        <td width="100" align="center">限时抢购</td>
			
 
				-        <td width="100" align="center">促销打折</td>
			
 
				-        <td width="200" align="center">&nbsp;</td>
			
 
				-    </tr>
			
 
				-</table></td>
			
 
				-</tr>
			
 
				-</table>
			
 
				-<!-- 菜单导航 end -->
			
 
				-<!-- 中间部分 start -->
			
 
				-<table width="1200" border="0" align="center" cellpadding="0" cellspacing="0" class="padding-top">
			
 
				-    <tr>
			
 
				-        <td width="220" valign="top"> <!-- 购物分类 start-->
			
 
				-
			
 
				-            <table width="100%" border="0" cellspacing="1" cellpadding="0" class="table1" bgcolor="#e5e4e1">
			
 
				-                <c:forEach items="${goodsType}" var="goodt">
			
 
				-                    <tr>
			
 
				-                        <th><a href="<%=basePath%>/shoppingShow?goodTypeId=${goodt.id}">${goodt.typename}</a></th>
			
 
				-                    </tr>
			
 
				-                    <c:forEach items="${goodt.subType}" var="st">
			
 
				-                      <tr>
			
 
				-                          <%-<th><a href="<%basePath%>/shoppingShow?goodTypeId=${st.id}">$st.typename</a></th>%->
			
 
				-                          <td><span class="red_dot"></span>
			
 
				-                            <a href="<%=basePath%>/shoppingShow?goodTypeId=${st.id}">${st.typename}</a>
			
 
				-                            <img src="images/arrow_r.jpg" align="right">
			
 
				-                          </td>
			
 
				-                      </tr>  
			
 
				-                    </c:forEach>
			
 
				-                </c:forEach>
			
 
				-         </table>
			
 
				-
			
 
				-         <!-- 购物分类end --></td>
			
 
				-         <td width="716" valign="top"><table width="100%" border="0" cellspacing="0" cellpading="0">
			
 
				-             <tr>
			
 
				-                 <td align="center">
			
 
				-                     <table width="100%" border="0" cellspacing="0" cell></table>
			
 
				-                 </td>
			
 
				-             </tr>
			
 
				-         </table>
			
 
				-        </td>
			
 
				-
			
 
				-
			
 
				-
			
--- a/src/main/java/WebsiteES/Dao/UserDao.java
+++ b/src/main/java/WebsiteES/Dao/UserDao.java
@@ -0,0 +1,51 @@
 
				+package WebsiteES.Dao;
			
 
				+
			
 
				+import java.io.IOException;
			
 
				+
			
 
				+import org.springframework.beans.factory.annotation.Autowired;
			
 
				+import org.springframework.stereotype.Service;
			
 
				+
			
 
				+import WebsiteES.myBatis.*;
			
 
				+
			
 
				+@Service
			
 
				+public class UserDao {
			
 
				+    
			
 
				+    public UserDao()
			
 
				+    {
			
 
				+        current = this;
			
 
				+    }
			
 
				+    private static UserDao current;
			
 
				+
			
 
				+    public static UseraccountMapper getUseraccountMapper() throws IOException
			
 
				+    {
			
 
				+        if(current != null)
			
 
				+            return current.useraccountMapper;
			
 
				+        else
			
 
				+        throw new IOException("mapper hasent been initlized");
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    public static UserCollectMapper getUserCollectMapper() throws IOException
			
 
				+    {
			
 
				+        if(current != null)
			
 
				+            return current.userCollectMapper;
			
 
				+        else
			
 
				+        throw new IOException("mapper hasent been initlized");
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    public static UserCartMapper getUserCartMapper() throws IOException
			
 
				+    {
			
 
				+        if(current != null)
			
 
				+            return current.userCartMapper;
			
 
				+        else
			
 
				+        throw new IOException("mapper hasent been initlized");
			
 
				+    }
			
 
				+
			
 
				+    @Autowired
			
 
				+    private UseraccountMapper useraccountMapper;
			
 
				+    @Autowired
			
 
				+    private UserCollectMapper userCollectMapper;
			
 
				+    @Autowired
			
 
				+    private UserCartMapper userCartMapper;
			
 
				+}
			
--- a/src/main/java/WebsiteES/User.java
+++ b/src/main/java/WebsiteES/User.java
@@ -0,0 +1,37 @@
 
				+package WebsiteES;
			
 
				+
			
 
				+import java.io.IOException;
			
 
				+
			
 
				+import WebsiteES.Dao.UserDao;
			
 
				+import WebsiteES.myBatis.Useraccount;
			
 
				+import group04.*;
			
 
				+
			
 
				+public class User extends BasicNode{
			
 
				+    
			
 
				+    
			
 
				+    
			
 
				+    private Useraccount userInfo = null;
			
 
				+
			
 
				+    @Override
			
 
				+    protected void postInsert(long id) {
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    @Override
			
 
				+    public void setId(long id) throws IOException {
			
 
				+        // TODO Auto-generated method stub
			
 
				+        if(id > 0)
			
 
				+        {
			
 
				+            userInfo = new Useraccount();
			
 
				+            // userInfo.set
			
 
				+            // UserDao.getUseraccountMapper().selectByPrimaryKey(key)
			
 
				+        }
			
 
				+        super.setId(id);
			
 
				+    }
			
 
				+
			
 
				+    @Override
			
 
				+    public boolean defineded() {
			
 
				+        // TODO Auto-generated method stub
			
 
				+        return super.defineded() && userInfo != null;
			
 
				+    }
			
 
				+}
			
--- a/src/main/java/WebsiteES/myBatis/UserCart.java
+++ b/src/main/java/WebsiteES/myBatis/UserCart.java
@@ -0,0 +1,67 @@
 
				+package WebsiteES.myBatis;
			
 
				+
			
 
				+public class UserCart {
			
 
				+    /**
			
 
				+     * This field was generated by MyBatis Generator.
			
 
				+     * This field corresponds to the database column user_cart.user_Cart_Id
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    private Long userCartId;
			
 
				+
			
 
				+    /**
			
 
				+     * This field was generated by MyBatis Generator.
			
 
				+     * This field corresponds to the database column user_cart.mun
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    private Integer mun;
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method returns the value of the database column user_cart.user_Cart_Id
			
 
				+     *
			
 
				+     * @return the value of user_cart.user_Cart_Id
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public Long getUserCartId() {
			
 
				+        return userCartId;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method sets the value of the database column user_cart.user_Cart_Id
			
 
				+     *
			
 
				+     * @param userCartId the value for user_cart.user_Cart_Id
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public void setUserCartId(Long userCartId) {
			
 
				+        this.userCartId = userCartId;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method returns the value of the database column user_cart.mun
			
 
				+     *
			
 
				+     * @return the value of user_cart.mun
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public Integer getMun() {
			
 
				+        return mun;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method sets the value of the database column user_cart.mun
			
 
				+     *
			
 
				+     * @param mun the value for user_cart.mun
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public void setMun(Integer mun) {
			
 
				+        this.mun = mun;
			
 
				+    }
			
 
				+}
			
--- a/src/main/java/WebsiteES/myBatis/UserCartMapper.java
+++ b/src/main/java/WebsiteES/myBatis/UserCartMapper.java
@@ -0,0 +1,53 @@
 
				+package WebsiteES.myBatis;
			
 
				+
			
 
				+import WebsiteES.myBatis.UserCart;
			
 
				+
			
 
				+public interface UserCartMapper {
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_cart
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int deleteByPrimaryKey(Long userCartId);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_cart
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int insert(UserCart record);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_cart
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int insertSelective(UserCart record);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_cart
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    UserCart selectByPrimaryKey(Long userCartId);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_cart
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int updateByPrimaryKeySelective(UserCart record);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_cart
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int updateByPrimaryKey(UserCart record);
			
 
				+}
			
--- a/src/main/java/WebsiteES/myBatis/UserCollect.java
+++ b/src/main/java/WebsiteES/myBatis/UserCollect.java
@@ -0,0 +1,67 @@
 
				+package WebsiteES.myBatis;
			
 
				+
			
 
				+public class UserCollect {
			
 
				+    /**
			
 
				+     * This field was generated by MyBatis Generator.
			
 
				+     * This field corresponds to the database column user_collect.user_collect_Id
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    private Long userCollectId;
			
 
				+
			
 
				+    /**
			
 
				+     * This field was generated by MyBatis Generator.
			
 
				+     * This field corresponds to the database column user_collect.goodId
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    private Long goodid;
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method returns the value of the database column user_collect.user_collect_Id
			
 
				+     *
			
 
				+     * @return the value of user_collect.user_collect_Id
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public Long getUserCollectId() {
			
 
				+        return userCollectId;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method sets the value of the database column user_collect.user_collect_Id
			
 
				+     *
			
 
				+     * @param userCollectId the value for user_collect.user_collect_Id
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public void setUserCollectId(Long userCollectId) {
			
 
				+        this.userCollectId = userCollectId;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method returns the value of the database column user_collect.goodId
			
 
				+     *
			
 
				+     * @return the value of user_collect.goodId
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public Long getGoodid() {
			
 
				+        return goodid;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method sets the value of the database column user_collect.goodId
			
 
				+     *
			
 
				+     * @param goodid the value for user_collect.goodId
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    public void setGoodid(Long goodid) {
			
 
				+        this.goodid = goodid;
			
 
				+    }
			
 
				+}
			
--- a/src/main/java/WebsiteES/myBatis/UserCollectMapper.java
+++ b/src/main/java/WebsiteES/myBatis/UserCollectMapper.java
@@ -0,0 +1,53 @@
 
				+package WebsiteES.myBatis;
			
 
				+
			
 
				+import WebsiteES.myBatis.UserCollect;
			
 
				+
			
 
				+public interface UserCollectMapper {
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_collect
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int deleteByPrimaryKey(Long userCollectId);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_collect
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int insert(UserCollect record);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_collect
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int insertSelective(UserCollect record);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_collect
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    UserCollect selectByPrimaryKey(Long userCollectId);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_collect
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int updateByPrimaryKeySelective(UserCollect record);
			
 
				+
			
 
				+    /**
			
 
				+     * This method was generated by MyBatis Generator.
			
 
				+     * This method corresponds to the database table user_collect
			
 
				+     *
			
 
				+     * @mbggenerated
			
 
				+     */
			
 
				+    int updateByPrimaryKey(UserCollect record);
			
 
				+}
			
--- a/src/main/java/WebsiteES/myBatis/UseraccountMapper.java
+++ b/src/main/java/WebsiteES/myBatis/UseraccountMapper.java
@@ -1,5 +1,7 @@
 
				 package WebsiteES.myBatis;
			
 
				 
			
 
				+import java.util.List;
			
 
				+
			
 
				 import WebsiteES.myBatis.Useraccount;
			
 
				 import WebsiteES.myBatis.UseraccountKey;
			
 
				 
			
@@ -51,4 +53,8 @@ public interface UseraccountMapper {
 
				      * @mbggenerated
			
 
				      */
			
 
				     int updateByPrimaryKey(Useraccount record);
			
 
				+
			
 
				+
			
 
				+    
			
 
				+    List<Useraccount> selectByEmailOrId(UseraccountKey key);
			
 
				 }
			
--- a/src/main/java/group04/BasicNode.java
+++ b/src/main/java/group04/BasicNode.java
@@ -134,7 +134,7 @@ public class BasicNode implements Iterable<BasicNode>
 
				                 BasicNode node = this.getChildLevel();
			
 
				                 while(node != null)
			
 
				                 {
			
 
				-                    BasicNode next = node.getNextNode();
			
 
				+                    BasicNode next = node.nextNode;
			
 
				                     node.deleteNode();
			
 
				                     node = next;
			
 
				                 }
			
@@ -151,6 +151,8 @@ public class BasicNode implements Iterable<BasicNode>
 
				                     NodeDao.getCurrentMapper().insert(data);
			
 
				                     //delete
			
 
				                     if(defineded()) NodeDao.getCurrentMapper().deleteByPrimaryKey(this.id);
			
 
				+                    
			
 
				+                    postInsert(id);
			
 
				                 }
			
 
				                 catch (IOException IOEx)
			
 
				                 {
			
@@ -175,7 +177,12 @@ public class BasicNode implements Iterable<BasicNode>
 
				      * for override, invoke when load feom database
			
 
				      * @param id currectt id information
			
 
				      */
			
 
				-    private void InitAfterLoad(long id)
			
 
				+    protected void InitAfterLoad(long id)
			
 
				+    {
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    protected void postInsert(long id)
			
 
				     {
			
 
				 
			
 
				     }
			
@@ -192,15 +199,15 @@ public class BasicNode implements Iterable<BasicNode>
 
				         //node id
			
 
				         data.setId(getId());
			
 
				         //next element
			
 
				-        node = getNextNode();
			
 
				+        node = nextNode;
			
 
				         if(node != null && node.vaildity())data.setNextId(node.getId());
			
 
				         else data.setNextId(null);
			
 
				         //perv element
			
 
				-        node = getPervNode();
			
 
				+        node = pervNode;
			
 
				         if(node != null && node.vaildity())data.setPrevId(node.getId());
			
 
				         else data.setPrevId(null);
			
 
				         //parent element
			
 
				-        node = getParentNode();
			
 
				+        node = parentNode;
			
 
				         if(node != null && node.vaildity())data.setParentId(node.getId());
			
 
				         else data.setParentId(null);
			
 
				         //chile level
			
@@ -650,10 +657,10 @@ public class BasicNode implements Iterable<BasicNode>
 
				     public long getLayout()
			
 
				     {
			
 
				         long result = 0;
			
 
				-        BasicNode node =this.getParentNode();
			
 
				+        BasicNode node =this.parentNode;
			
 
				         while(node != null)
			
 
				         {
			
 
				-            node = node.getParentNode();
			
 
				+            node = node.parentNode;
			
 
				             ++result;
			
 
				         }
			
 
				         return result;
			
--- a/src/main/java/group04/nodeOptConsol.java
+++ b/src/main/java/group04/nodeOptConsol.java
@@ -29,7 +29,7 @@ public class nodeOptConsol {
 
				                 if(current != null) System.out.print(current.getClass() + "#" + current.getId());
			
 
				                 System.out.print(">");
			
 
				                 command = br.readLine();
			
 
				-            } 
			
 
				+            }
			
 
				             catch (Exception e) 
			
 
				             {
			
 
				                 System.out.println("errer : " + e.toString());
			
--- a/src/main/resources/DataBase.sql
+++ b/src/main/resources/DataBase.sql
@@ -21,7 +21,7 @@ create table if not exists nodeinfo
 
				     +   cart
			
 
				         +   user_cart[]
			
 
				     +   collect
			
 
				-        +   goods[]
			
 
				+        +   user_collect[]
			
 
				 */
			
 
				 create table if not exists userAccount
			
 
				 (
			
@@ -36,9 +36,14 @@ create table if not exists userAccount
 
				 create table if not exists user_cart
			
 
				 (
			
 
				     user_Cart_Id bigint not null primary key,
			
 
				-    count int not null,
			
 
				+    mun int not null
			
 
				 );
			
 
				 
			
 
				+create table if not exists user_collect
			
 
				+(
			
 
				+    user_collect_Id bigint not null primary key,
			
 
				+    goodId bigint not null
			
 
				+);
			
 
				 /*  node stuctor
			
 
				     store
			
 
				     +   goods[]
			
--- a/src/main/resources/generatorConfig.xml
+++ b/src/main/resources/generatorConfig.xml
@@ -32,13 +32,13 @@
 
				             <property name="enableSubPackages" value="true"/>
			
 
				         </javaClientGenerator>
			
 
				 
			
 
				-        <table
			
 
				+        <!-- <table
			
 
				                 tableName="userAccount"
			
 
				         enableCountByExample="false"
			
 
				         enableDeleteByExample="false"
			
 
				         enableSelectByExample="false"
			
 
				         enableUpdateByExample="false"
			
 
				-        />
			
 
				+        /> -->
			
 
				 
			
 
				         <table
			
 
				                 tableName="user_cart"
			
@@ -48,7 +48,7 @@
 
				         enableUpdateByExample="false"
			
 
				         />
			
 
				 
			
 
				-        <table
			
 
				+        <!-- <table
			
 
				                 tableName="store"
			
 
				         enableCountByExample="false"
			
 
				         enableDeleteByExample="false"
			
@@ -79,5 +79,13 @@
 
				         enableSelectByExample="false"
			
 
				         enableUpdateByExample="false"
			
 
				         />
			
 
				+
			
 
				+        <table
			
 
				+                tableName="user_collect"
			
 
				+        enableCountByExample="false"
			
 
				+        enableDeleteByExample="false"
			
 
				+        enableSelectByExample="false"
			
 
				+        enableUpdateByExample="false"
			
 
				+        /> -->
			
 
				     </context>
			
 
				 </generatorConfiguration>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/SelectionMapper.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/SelectionMapper.xml
@@ -1,21 +1,20 @@
 
				 <?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" >
			
 
				+<mapper namespace="WebsiteES.myBatis.UserCartMapper" >
			
 
				+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.UserCart" >
			
 
				     <!--
			
 
				       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" />
			
 
				+    <id column="user_Cart_Id" property="userCartId" jdbcType="BIGINT" />
			
 
				+    <result column="mun" property="mun" jdbcType="INTEGER" />
			
 
				   </resultMap>
			
 
				   <sql id="Base_Column_List" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
 
				       This element is automatically generated by MyBatis Generator, do not modify.
			
 
				     -->
			
 
				-    selection_id, name, price
			
 
				+    user_Cart_Id, mun
			
 
				   </sql>
			
 
				   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
			
 
				     <!--
			
@@ -24,80 +23,68 @@
 
				     -->
			
 
				     select 
			
 
				     <include refid="Base_Column_List" />
			
 
				-    from selection
			
 
				-    where selection_id = #{selectionId,jdbcType=BIGINT}
			
 
				+    from user_cart
			
 
				+    where user_Cart_Id = #{userCartId,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 from user_cart
			
 
				+    where user_Cart_Id = #{userCartId,jdbcType=BIGINT}
			
 
				   </delete>
			
 
				-  <insert id="insert" parameterType="WebsiteES.myBatis.Selection" >
			
 
				+  <insert id="insert" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				     <!--
			
 
				       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 into user_cart (user_Cart_Id, mun)
			
 
				+    values (#{userCartId,jdbcType=BIGINT}, #{mun,jdbcType=INTEGER})
			
 
				   </insert>
			
 
				-  <insert id="insertSelective" parameterType="WebsiteES.myBatis.Selection" >
			
 
				+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
 
				       This element is automatically generated by MyBatis Generator, do not modify.
			
 
				     -->
			
 
				-    insert into selection
			
 
				+    insert into user_cart
			
 
				     <trim prefix="(" suffix=")" suffixOverrides="," >
			
 
				-      <if test="selectionId != null" >
			
 
				-        selection_id,
			
 
				+      <if test="userCartId != null" >
			
 
				+        user_Cart_Id,
			
 
				       </if>
			
 
				-      <if test="name != null" >
			
 
				-        name,
			
 
				-      </if>
			
 
				-      <if test="price != null" >
			
 
				-        price,
			
 
				+      <if test="mun != null" >
			
 
				+        mun,
			
 
				       </if>
			
 
				     </trim>
			
 
				     <trim prefix="values (" suffix=")" suffixOverrides="," >
			
 
				-      <if test="selectionId != null" >
			
 
				-        #{selectionId,jdbcType=BIGINT},
			
 
				-      </if>
			
 
				-      <if test="name != null" >
			
 
				-        #{name,jdbcType=VARCHAR},
			
 
				+      <if test="userCartId != null" >
			
 
				+        #{userCartId,jdbcType=BIGINT},
			
 
				       </if>
			
 
				-      <if test="price != null" >
			
 
				-        #{price,jdbcType=REAL},
			
 
				+      <if test="mun != null" >
			
 
				+        #{mun,jdbcType=INTEGER},
			
 
				       </if>
			
 
				     </trim>
			
 
				   </insert>
			
 
				-  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.Selection" >
			
 
				+  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
 
				       This element is automatically generated by MyBatis Generator, do not modify.
			
 
				     -->
			
 
				-    update selection
			
 
				+    update user_cart
			
 
				     <set >
			
 
				-      <if test="name != null" >
			
 
				-        name = #{name,jdbcType=VARCHAR},
			
 
				-      </if>
			
 
				-      <if test="price != null" >
			
 
				-        price = #{price,jdbcType=REAL},
			
 
				+      <if test="mun != null" >
			
 
				+        mun = #{mun,jdbcType=INTEGER},
			
 
				       </if>
			
 
				     </set>
			
 
				-    where selection_id = #{selectionId,jdbcType=BIGINT}
			
 
				+    where user_Cart_Id = #{userCartId,jdbcType=BIGINT}
			
 
				   </update>
			
 
				-  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.Selection" >
			
 
				+  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				     <!--
			
 
				       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 user_cart
			
 
				+    set mun = #{mun,jdbcType=INTEGER}
			
 
				+    where user_Cart_Id = #{userCartId,jdbcType=BIGINT}
			
 
				   </update>
			
 
				 </mapper>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/GoodsMapper.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/GoodsMapper.xml
@@ -1,22 +1,20 @@
 
				 <?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" >
			
 
				+<mapper namespace="WebsiteES.myBatis.UserCollectMapper" >
			
 
				+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.UserCollect" >
			
 
				     <!--
			
 
				       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" />
			
 
				+    <id column="user_collect_Id" property="userCollectId" jdbcType="BIGINT" />
			
 
				+    <result column="goodId" property="goodid" jdbcType="BIGINT" />
			
 
				   </resultMap>
			
 
				   <sql id="Base_Column_List" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
 
				       This element is automatically generated by MyBatis Generator, do not modify.
			
 
				     -->
			
 
				-    goods_id, postion, name, star
			
 
				+    user_collect_Id, goodId
			
 
				   </sql>
			
 
				   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
			
 
				     <!--
			
@@ -25,90 +23,68 @@
 
				     -->
			
 
				     select 
			
 
				     <include refid="Base_Column_List" />
			
 
				-    from goods
			
 
				-    where goods_id = #{goodsId,jdbcType=BIGINT}
			
 
				+    from user_collect
			
 
				+    where user_collect_Id = #{userCollectId,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 from user_collect
			
 
				+    where user_collect_Id = #{userCollectId,jdbcType=BIGINT}
			
 
				   </delete>
			
 
				-  <insert id="insert" parameterType="WebsiteES.myBatis.Goods" >
			
 
				+  <insert id="insert" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				     <!--
			
 
				       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 into user_collect (user_collect_Id, goodId)
			
 
				+    values (#{userCollectId,jdbcType=BIGINT}, #{goodid,jdbcType=BIGINT})
			
 
				   </insert>
			
 
				-  <insert id="insertSelective" parameterType="WebsiteES.myBatis.Goods" >
			
 
				+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
 
				       This element is automatically generated by MyBatis Generator, do not modify.
			
 
				     -->
			
 
				-    insert into goods
			
 
				+    insert into user_collect
			
 
				     <trim prefix="(" suffix=")" suffixOverrides="," >
			
 
				-      <if test="goodsId != null" >
			
 
				-        goods_id,
			
 
				+      <if test="userCollectId != null" >
			
 
				+        user_collect_Id,
			
 
				       </if>
			
 
				-      <if test="postion != null" >
			
 
				-        postion,
			
 
				-      </if>
			
 
				-      <if test="name != null" >
			
 
				-        name,
			
 
				-      </if>
			
 
				-      <if test="star != null" >
			
 
				-        star,
			
 
				+      <if test="goodid != null" >
			
 
				+        goodId,
			
 
				       </if>
			
 
				     </trim>
			
 
				     <trim prefix="values (" suffix=")" suffixOverrides="," >
			
 
				-      <if test="goodsId != null" >
			
 
				-        #{goodsId,jdbcType=BIGINT},
			
 
				-      </if>
			
 
				-      <if test="postion != null" >
			
 
				-        #{postion,jdbcType=VARCHAR},
			
 
				+      <if test="userCollectId != null" >
			
 
				+        #{userCollectId,jdbcType=BIGINT},
			
 
				       </if>
			
 
				-      <if test="name != null" >
			
 
				-        #{name,jdbcType=VARCHAR},
			
 
				-      </if>
			
 
				-      <if test="star != null" >
			
 
				-        #{star,jdbcType=INTEGER},
			
 
				+      <if test="goodid != null" >
			
 
				+        #{goodid,jdbcType=BIGINT},
			
 
				       </if>
			
 
				     </trim>
			
 
				   </insert>
			
 
				-  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.Goods" >
			
 
				+  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
 
				       This element is automatically generated by MyBatis Generator, do not modify.
			
 
				     -->
			
 
				-    update goods
			
 
				+    update user_collect
			
 
				     <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 test="goodid != null" >
			
 
				+        goodId = #{goodid,jdbcType=BIGINT},
			
 
				       </if>
			
 
				     </set>
			
 
				-    where goods_id = #{goodsId,jdbcType=BIGINT}
			
 
				+    where user_collect_Id = #{userCollectId,jdbcType=BIGINT}
			
 
				   </update>
			
 
				-  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.Goods" >
			
 
				+  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				     <!--
			
 
				       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 user_collect
			
 
				+    set goodId = #{goodid,jdbcType=BIGINT}
			
 
				+    where user_collect_Id = #{userCollectId,jdbcType=BIGINT}
			
 
				   </update>
			
 
				 </mapper>
			
--- a/src/main/resources/myBatisMap/UseraccountMapper.xml
+++ b/src/main/resources/myBatisMap/UseraccountMapper.xml
@@ -29,6 +29,17 @@
 
				     where email = #{email,jdbcType=VARCHAR}
			
 
				       and userId = #{userid,jdbcType=BIGINT}
			
 
				   </select>
			
 
				+  <select id="selectByEmailOrId" 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}
			
 
				+      or userId = #{userid,jdbcType=BIGINT}
			
 
				+  </select>
			
 
				   <delete id="deleteByPrimaryKey" parameterType="WebsiteES.myBatis.UseraccountKey" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
--- a/src/test/java/test.java
+++ b/src/test/java/test.java
@@ -0,0 +1,35 @@
 
				+import java.io.BufferedReader;
			
 
				+import java.io.IOException;
			
 
				+import java.io.InputStreamReader;
			
 
				+import java.util.List;
			
 
				+
			
 
				+import org.junit.Test;
			
 
				+import org.springframework.context.support.ClassPathXmlApplicationContext;
			
 
				+
			
 
				+import WebsiteES.Dao.UserDao;
			
 
				+import WebsiteES.myBatis.Useraccount;
			
 
				+
			
 
				+public class test {
			
 
				+    private static ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("springmvc-config.xml");
			
 
				+
			
 
				+    public static ClassPathXmlApplicationContext getContext()
			
 
				+    {
			
 
				+        return context;
			
 
				+    }
			
 
				+    
			
 
				+    // private static 
			
 
				+    @Test
			
 
				+    public void test1() throws IOException
			
 
				+    {
			
 
				+        Useraccount account = new Useraccount();
			
 
				+        account.setUserid(1l);
			
 
				+        account.setPassword("test1");
			
 
				+        account.setPermission(1);
			
 
				+        account.setEmail("test1");
			
 
				+        UserDao.getUseraccountMapper().insert(account);
			
 
				+        account.setEmail("test2");
			
 
				+        UserDao.getUseraccountMapper().insert(account);
			
 
				+        List<Useraccount> accounts = UserDao.getUseraccountMapper().selectByEmailOrId(account);
			
 
				+        System.out.println(accounts);
			
 
				+    }
			
 
				+}
			
--- a/target/classes/DataBase.sql
+++ b/target/classes/DataBase.sql
@@ -21,7 +21,7 @@ create table if not exists nodeinfo
 
				     +   cart
			
 
				         +   user_cart[]
			
 
				     +   collect
			
 
				-        +   goods[]
			
 
				+        +   user_collect[]
			
 
				 */
			
 
				 create table if not exists userAccount
			
 
				 (
			
@@ -36,9 +36,14 @@ create table if not exists userAccount
 
				 create table if not exists user_cart
			
 
				 (
			
 
				     user_Cart_Id bigint not null primary key,
			
 
				-    count int not null,
			
 
				+    mun int not null
			
 
				 );
			
 
				 
			
 
				+create table if not exists user_collect
			
 
				+(
			
 
				+    user_collect_Id bigint not null primary key,
			
 
				+    goodId bigint not null
			
 
				+);
			
 
				 /*  node stuctor
			
 
				     store
			
 
				     +   goods[]
			
--- a/target/classes/WebsiteES/Dao/UserDao.class
+++ b/target/classes/WebsiteES/Dao/UserDao.class
--- a/target/classes/WebsiteES/User.class
+++ b/target/classes/WebsiteES/User.class
--- a/target/classes/WebsiteES/myBatis/UserCart.class
+++ b/target/classes/WebsiteES/myBatis/UserCart.class
--- a/target/classes/WebsiteES/myBatis/UserCartMapper.class
+++ b/target/classes/WebsiteES/myBatis/UserCartMapper.class
--- a/target/classes/WebsiteES/myBatis/UserCollect.class
+++ b/target/classes/WebsiteES/myBatis/UserCollect.class
--- a/target/classes/WebsiteES/myBatis/UserCollectMapper.class
+++ b/target/classes/WebsiteES/myBatis/UserCollectMapper.class
--- a/target/classes/WebsiteES/myBatis/UseraccountMapper.class
+++ b/target/classes/WebsiteES/myBatis/UseraccountMapper.class
--- a/target/classes/generatorConfig.xml
+++ b/target/classes/generatorConfig.xml
@@ -32,13 +32,13 @@
 
				             <property name="enableSubPackages" value="true"/>
			
 
				         </javaClientGenerator>
			
 
				 
			
 
				-        <table
			
 
				+        <!-- <table
			
 
				                 tableName="userAccount"
			
 
				         enableCountByExample="false"
			
 
				         enableDeleteByExample="false"
			
 
				         enableSelectByExample="false"
			
 
				         enableUpdateByExample="false"
			
 
				-        />
			
 
				+        /> -->
			
 
				 
			
 
				         <table
			
 
				                 tableName="user_cart"
			
@@ -48,7 +48,7 @@
 
				         enableUpdateByExample="false"
			
 
				         />
			
 
				 
			
 
				-        <table
			
 
				+        <!-- <table
			
 
				                 tableName="store"
			
 
				         enableCountByExample="false"
			
 
				         enableDeleteByExample="false"
			
@@ -79,5 +79,13 @@
 
				         enableSelectByExample="false"
			
 
				         enableUpdateByExample="false"
			
 
				         />
			
 
				+
			
 
				+        <table
			
 
				+                tableName="user_collect"
			
 
				+        enableCountByExample="false"
			
 
				+        enableDeleteByExample="false"
			
 
				+        enableSelectByExample="false"
			
 
				+        enableUpdateByExample="false"
			
 
				+        /> -->
			
 
				     </context>
			
 
				 </generatorConfiguration>
			
--- a/target/classes/group04/BasicNode$NodeIterator.class
+++ b/target/classes/group04/BasicNode$NodeIterator.class
--- a/target/classes/group04/BasicNode.class
+++ b/target/classes/group04/BasicNode.class
--- a/target/classes/group04/NodeDao$DaoState.class
+++ b/target/classes/group04/NodeDao$DaoState.class
--- a/target/classes/group04/NodeDao.class
+++ b/target/classes/group04/NodeDao.class
--- a/target/classes/group04/nodeOptConsol.class
+++ b/target/classes/group04/nodeOptConsol.class
--- a/target/classes/myBatisMap/UserCartMapper.xml
+++ b/target/classes/myBatisMap/UserCartMapper.xml
@@ -0,0 +1,90 @@
 
				+<?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.UserCartMapper" >
			
 
				+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.UserCart" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    <id column="user_Cart_Id" property="userCartId" jdbcType="BIGINT" />
			
 
				+    <result column="mun" property="mun" jdbcType="INTEGER" />
			
 
				+  </resultMap>
			
 
				+  <sql id="Base_Column_List" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    user_Cart_Id, mun
			
 
				+  </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 user_cart
			
 
				+    where user_Cart_Id = #{userCartId,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 user_cart
			
 
				+    where user_Cart_Id = #{userCartId,jdbcType=BIGINT}
			
 
				+  </delete>
			
 
				+  <insert id="insert" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    insert into user_cart (user_Cart_Id, mun)
			
 
				+    values (#{userCartId,jdbcType=BIGINT}, #{mun,jdbcType=INTEGER})
			
 
				+  </insert>
			
 
				+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    insert into user_cart
			
 
				+    <trim prefix="(" suffix=")" suffixOverrides="," >
			
 
				+      <if test="userCartId != null" >
			
 
				+        user_Cart_Id,
			
 
				+      </if>
			
 
				+      <if test="mun != null" >
			
 
				+        mun,
			
 
				+      </if>
			
 
				+    </trim>
			
 
				+    <trim prefix="values (" suffix=")" suffixOverrides="," >
			
 
				+      <if test="userCartId != null" >
			
 
				+        #{userCartId,jdbcType=BIGINT},
			
 
				+      </if>
			
 
				+      <if test="mun != null" >
			
 
				+        #{mun,jdbcType=INTEGER},
			
 
				+      </if>
			
 
				+    </trim>
			
 
				+  </insert>
			
 
				+  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    update user_cart
			
 
				+    <set >
			
 
				+      <if test="mun != null" >
			
 
				+        mun = #{mun,jdbcType=INTEGER},
			
 
				+      </if>
			
 
				+    </set>
			
 
				+    where user_Cart_Id = #{userCartId,jdbcType=BIGINT}
			
 
				+  </update>
			
 
				+  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.UserCart" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    update user_cart
			
 
				+    set mun = #{mun,jdbcType=INTEGER}
			
 
				+    where user_Cart_Id = #{userCartId,jdbcType=BIGINT}
			
 
				+  </update>
			
 
				+</mapper>
			
--- a/target/classes/myBatisMap/UserCollectMapper.xml
+++ b/target/classes/myBatisMap/UserCollectMapper.xml
@@ -0,0 +1,90 @@
 
				+<?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.UserCollectMapper" >
			
 
				+  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.UserCollect" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    <id column="user_collect_Id" property="userCollectId" jdbcType="BIGINT" />
			
 
				+    <result column="goodId" property="goodid" jdbcType="BIGINT" />
			
 
				+  </resultMap>
			
 
				+  <sql id="Base_Column_List" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    user_collect_Id, goodId
			
 
				+  </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 user_collect
			
 
				+    where user_collect_Id = #{userCollectId,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 user_collect
			
 
				+    where user_collect_Id = #{userCollectId,jdbcType=BIGINT}
			
 
				+  </delete>
			
 
				+  <insert id="insert" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    insert into user_collect (user_collect_Id, goodId)
			
 
				+    values (#{userCollectId,jdbcType=BIGINT}, #{goodid,jdbcType=BIGINT})
			
 
				+  </insert>
			
 
				+  <insert id="insertSelective" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    insert into user_collect
			
 
				+    <trim prefix="(" suffix=")" suffixOverrides="," >
			
 
				+      <if test="userCollectId != null" >
			
 
				+        user_collect_Id,
			
 
				+      </if>
			
 
				+      <if test="goodid != null" >
			
 
				+        goodId,
			
 
				+      </if>
			
 
				+    </trim>
			
 
				+    <trim prefix="values (" suffix=")" suffixOverrides="," >
			
 
				+      <if test="userCollectId != null" >
			
 
				+        #{userCollectId,jdbcType=BIGINT},
			
 
				+      </if>
			
 
				+      <if test="goodid != null" >
			
 
				+        #{goodid,jdbcType=BIGINT},
			
 
				+      </if>
			
 
				+    </trim>
			
 
				+  </insert>
			
 
				+  <update id="updateByPrimaryKeySelective" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    update user_collect
			
 
				+    <set >
			
 
				+      <if test="goodid != null" >
			
 
				+        goodId = #{goodid,jdbcType=BIGINT},
			
 
				+      </if>
			
 
				+    </set>
			
 
				+    where user_collect_Id = #{userCollectId,jdbcType=BIGINT}
			
 
				+  </update>
			
 
				+  <update id="updateByPrimaryKey" parameterType="WebsiteES.myBatis.UserCollect" >
			
 
				+    <!--
			
 
				+      WARNING - @mbggenerated
			
 
				+      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				+    -->
			
 
				+    update user_collect
			
 
				+    set goodId = #{goodid,jdbcType=BIGINT}
			
 
				+    where user_collect_Id = #{userCollectId,jdbcType=BIGINT}
			
 
				+  </update>
			
 
				+</mapper>
			
--- a/target/classes/myBatisMap/UseraccountMapper.xml
+++ b/target/classes/myBatisMap/UseraccountMapper.xml
@@ -29,6 +29,17 @@
 
				     where email = #{email,jdbcType=VARCHAR}
			
 
				       and userId = #{userid,jdbcType=BIGINT}
			
 
				   </select>
			
 
				+  <select id="selectByEmailOrId" 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}
			
 
				+      or userId = #{userid,jdbcType=BIGINT}
			
 
				+  </select>
			
 
				   <delete id="deleteByPrimaryKey" parameterType="WebsiteES.myBatis.UseraccountKey" >
			
 
				     <!--
			
 
				       WARNING - @mbggenerated
			
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +0,0 @@
 
				-#Generated by Maven
			
 
				-#Wed Dec 29 15:28:47 CST 2021
			
 
				-groupId=com.example
			
 
				-artifactId=raoyin
			
 
				-version=1.0-SNAPSHOT
			
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,18 +0,0 @@
 
				-WebsiteES\myBatis\SelectionMapper.class
			
 
				-group04\BasicNode$1.class
			
 
				-WebsiteES\myBatis\UseraccountMapper.class
			
 
				-WebsiteES\myBatis\Store.class
			
 
				-group04\NodeDao.class
			
 
				-WebsiteES\myBatis\StoreMapper.class
			
 
				-group04\nodeOptConsol.class
			
 
				-WebsiteES\WebApp.class
			
 
				-WebsiteES\myBatis\UseraccountKey.class
			
 
				-group04\BasicNode$NodeIterator.class
			
 
				-WebsiteES\myBatis\Useraccount.class
			
 
				-WebsiteES\myBatis\Goods.class
			
 
				-group04\myBatis\Nodeinfo.class
			
 
				-group04\NodeDao$DaoState.class
			
 
				-WebsiteES\myBatis\GoodsMapper.class
			
 
				-group04\BasicNode.class
			
 
				-group04\myBatis\NodeinfoMapper.class
			
 
				-WebsiteES\myBatis\Selection.class
			
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,15 +0,0 @@
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\Selection.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\UseraccountMapper.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\group04\BasicNode.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\Goods.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\WebApp.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\SelectionMapper.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\GoodsMapper.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\Store.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\UseraccountKey.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\group04\myBatis\NodeinfoMapper.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\StoreMapper.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\WebsiteES\myBatis\Useraccount.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\group04\NodeDao.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\group04\nodeOptConsol.java
			
 
				-f:\JavaProjects\RaoYing\src\main\java\group04\myBatis\Nodeinfo.java
			
--- a/target/raoyin-1.0-SNAPSHOT.war
+++ b/target/raoyin-1.0-SNAPSHOT.war
--- a/target/raoyin-1.0-SNAPSHOT/ShoppingCart.html
+++ b/target/raoyin-1.0-SNAPSHOT/ShoppingCart.html
@@ -1,167 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				-<head>
			
 
				-    <meta charset="UTF-8">
			
 
				-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				-    <title>Document</title>
			
 
				-    <link rel="stylesheet" type="text/css" href="css/CartCss.css">
			
 
				-</head>
			
 
				-<body>
			
 
				-    <form action="ShoppingCart.html" method="get">
			
 
				-        <div class="Store">
			
 
				-            <a id="lable">
			
 
				-                <input type="checkbox">
			
 
				-                <div id="StoreIcon">
			
 
				-                    <img src="https://assets.burberry.com/is/image/Burberryltd/0c498f053ef33c97aab8f9a472265caed3e75a39.jpg?$BBY_V2_SL_3x4$=&wid=1903&hei=2537">
			
 
				-                </div>
			
 
				-                <h3>StoreA</h3>
			
 
				-            </a>
			
 
				-            <div class="goods">
			
 
				-                <input name="seleceed" type="checkbox">
			
 
				-                <div id="GoodsIcon">
			
 
				-                    <img src="https://assets.burberry.com/is/image/Burberryltd/0c498f053ef33c97aab8f9a472265caed3e75a39.jpg?$BBY_V2_SL_3x4$=&wid=1903&hei=2537">
			
 
				-                </div>
			
 
				-                <div id="exp">
			
 
				-                    <h3>GoodsA</h3>
			
 
				-                    <p>info & selected</p>
			
 
				-                    <h4>20</h4>
			
 
				-                    <div id="count">
			
 
				-                        <div>-</div>
			
 
				-                        <input name="count" type="text">
			
 
				-                        <div>+</div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    
			
 
				-    
			
 
				-        <div class="Store">
			
 
				-            <a id="lable">
			
 
				-                <input type="checkbox">
			
 
				-                <div id="StoreIcon">
			
 
				-                    <img src="https://assets.burberry.com/is/image/Burberryltd/0c498f053ef33c97aab8f9a472265caed3e75a39.jpg?$BBY_V2_SL_3x4$=&wid=1903&hei=2537">
			
 
				-                </div>
			
 
				-                <h3>StoreB</h3>
			
 
				-            </a>
			
 
				-            <div class="goods">
			
 
				-                <input name="selected" type="checkbox">
			
 
				-                <div id="GoodsIcon">
			
 
				-                    <img src="https://assets.burberry.com/is/image/Burberryltd/0c498f053ef33c97aab8f9a472265caed3e75a39.jpg?$BBY_V2_SL_3x4$=&wid=1903&hei=2537">
			
 
				-                </div>
			
 
				-                <div id="exp">
			
 
				-                    <h3>GoodsB</h3>
			
 
				-                    <p>info & selected</p>
			
 
				-                    <h4>20</h4>
			
 
				-                    <div id="count">
			
 
				-                        <div>-</div>
			
 
				-                        <input name="count" type="text">
			
 
				-                        <div>+</div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="goods">
			
 
				-                <input name="selected" type="checkbox">
			
 
				-                <div id="GoodsIcon">
			
 
				-                    <img src="https://assets.burberry.com/is/image/Burberryltd/0c498f053ef33c97aab8f9a472265caed3e75a39.jpg?$BBY_V2_SL_3x4$=&wid=1903&hei=2537">
			
 
				-                </div>
			
 
				-                <div id="exp">
			
 
				-                    <h3>GoodsC</h3>
			
 
				-                    <p>info & selected</p>
			
 
				-                    <h4>20</h4>
			
 
				-                    <div id="count">
			
 
				-                        <div>-</div>
			
 
				-                        <input name="count" type="text">
			
 
				-                        <div>+</div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <div id="BottomBar">
			
 
				-            <input type="submit" name="submit" value="Delete">
			
 
				-            <input type="submit" name="submit" value="Settle">
			
 
				-        </div>
			
 
				-    </form>
			
 
				-
			
 
				-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
			
 
				-    <script>
			
 
				-        $("form>div.Store>div.goods>div#exp>div#count>div").click(function()
			
 
				-        {
			
 
				-            if(this.innerHTML == "-")
			
 
				-            {
			
 
				-                let text = $(this).next()[0];
			
 
				-                let num = Number.parseInt(text.value);
			
 
				-                // console.dir(num);
			
 
				-                if(num.toString() == "NaN") num = 0;
			
 
				-                else num = Math.max(0,--num);
			
 
				-                text.value = num;
			
 
				-            }
			
 
				-            else
			
 
				-            if(this.innerHTML == "+")
			
 
				-            {
			
 
				-                let text = $(this).prev()[0];
			
 
				-                let num = Number.parseInt(text.value);
			
 
				-                // console.dir(num);
			
 
				-                if(num.toString() == "NaN") num = 1;
			
 
				-                else num = Math.max(0,++num);
			
 
				-                text.value = num;
			
 
				-            }
			
 
				-        });
			
 
				-        $("form>div.Store>a#lable>input").change(function()
			
 
				-        {
			
 
				-            let items = $(this).parent().parent().children("div.goods").children("input");
			
 
				-            // console.dir(items);
			
 
				-            for(let i = 0; i < items.length; ++i)
			
 
				-            {
			
 
				-                items[i].checked = this.checked;
			
 
				-            }
			
 
				-        });
			
 
				-        $("form>div.Store>div.goods>input").change(function()
			
 
				-        {
			
 
				-            let lableChecker = $(this).parent().parent().children("a#lable").children("input");
			
 
				-            if(this.checked)
			
 
				-            {
			
 
				-                let otherGoods = $(this).parent().parent().children("div.goods").children("input").not(this);
			
 
				-                for(let i = 0; i < otherGoods.length; ++i)
			
 
				-                {
			
 
				-                    // console.dir(otherGoods[i].checked);
			
 
				-                    if(!otherGoods[i].checked)
			
 
				-                    {
			
 
				-                        return;
			
 
				-                    }
			
 
				-                }
			
 
				-                lableChecker.prop("checked", true);
			
 
				-            }
			
 
				-            else
			
 
				-            {
			
 
				-                lableChecker.prop("checked", false);
			
 
				-            }
			
 
				-        })
			
 
				-        $("form>div.Store>div.goods>div#exp>div#count>input").focusout(function()
			
 
				-        {
			
 
				-            let num = Number.parseInt(this.value);
			
 
				-            if(num.toString() == "NaN") num = 0;
			
 
				-            this.value = num;
			
 
				-        }).keyup(function()
			
 
				-        {
			
 
				-            let num = Number.parseInt(this.value);
			
 
				-            if(num.toString() == "NaN") num = 0;
			
 
				-            this.value = num;
			
 
				-        }).keydown(function()
			
 
				-        {
			
 
				-            let num = Number.parseInt(this.value);
			
 
				-            if(num.toString() == "NaN") num = 0;
			
 
				-            this.value = num;
			
 
				-        });
			
 
				-        $("form>div#BottomBar>input[type='submit']").click(function()
			
 
				-        {
			
 
				-            let counts = $("form>div#Store>div.goods>div#exp>div#count>input");
			
 
				-            for (let index = 0; index < counts.length; index++) {
			
 
				-                let num = Number.parseInt( counts[index].value);
			
 
				-                if(num.toString() == "NaN") num = 0;
			
 
				-                counts[index].value = num;
			
 
				-            }
			
 
				-        });
			
 
				-    </script>
			
 
				-</body>
			
 
				-</html>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/DataBase.sql
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/DataBase.sql
@@ -1,78 +0,0 @@
 
				-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)
			
 
				-);
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/MyBatis-config.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/MyBatis-config.xml
@@ -1,31 +0,0 @@
 
				-<?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>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/WebApp.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/WebApp.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Goods.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Goods.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/GoodsMapper.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/GoodsMapper.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Selection.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Selection.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/SelectionMapper.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/SelectionMapper.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Store.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Store.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/StoreMapper.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/StoreMapper.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Useraccount.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/Useraccount.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/UseraccountKey.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/UseraccountKey.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/UseraccountMapper.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/WebsiteES/myBatis/UseraccountMapper.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/db.properties
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/db.properties
@@ -1,4 +0,0 @@
 
				-jdbc.driver=com.mysql.jdbc.Driver
			
 
				-jdbc.url=jdbc:mysql://localhost:3306/ShoppingWebsite
			
 
				-jdbc.username=root
			
 
				-jdbc.password=123456
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/generatorConfig.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/generatorConfig.xml
@@ -1,83 +0,0 @@
 
				-<?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>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/BasicNode$1.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/BasicNode$1.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/BasicNode$NodeIterator.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/BasicNode$NodeIterator.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/BasicNode.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/BasicNode.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/NodeDao$DaoState.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/NodeDao$DaoState.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/NodeDao.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/NodeDao.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/myBatis/Nodeinfo.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/myBatis/Nodeinfo.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/myBatis/NodeinfoMapper.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/myBatis/NodeinfoMapper.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/nodeOptConsol.class
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/group04/nodeOptConsol.class
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/NodeinfoMapper.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/NodeinfoMapper.xml
@@ -1,141 +0,0 @@
 
				-<?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.NodeinfoMapper">
			
 
				-  <resultMap id="BaseResultMap" type="WebsiteES.myBatis.Nodeinfo">
			
 
				-    <!--
			
 
				-      WARNING - @mbggenerated
			
 
				-      This element is automatically generated by MyBatis Generator, do not modify.
			
 
				-    -->
			
 
				-    <id column="id" jdbcType="BIGINT" property="id" />
			
 
				-    <result column="prev_id" jdbcType="BIGINT" property="prevId" />
			
 
				-    <result column="next_id" jdbcType="BIGINT" property="nextId" />
			
 
				-    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
			
 
				-    <result column="child_id" jdbcType="BIGINT" property="childId" />
			
 
				-    <result column="obj_type" jdbcType="VARCHAR" property="objType" />
			
 
				-  </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" parameterType="java.lang.Long" resultMap="BaseResultMap">
			
 
				-    <!--
			
 
				-      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="WebsiteES.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="WebsiteES.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="WebsiteES.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="WebsiteES.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>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/StoreMapper.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/StoreMapper.xml
@@ -1,59 +0,0 @@
 
				-<?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>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/UseraccountMapper.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/myBatisMap/UseraccountMapper.xml
@@ -1,114 +0,0 @@
 
				-<?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>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/springmvc-config.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/classes/springmvc-config.xml
@@ -1,61 +0,0 @@
 
				-<?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>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/jsp/shoppingShow.jsp
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/jsp/shoppingShow.jsp
@@ -1,316 +0,0 @@
 
				-<%--
			
 
				-  Created by IntelliJ IDEA.
			
 
				-  User: 叶本泽
			
 
				-  Date: 2021/12/27
			
 
				-  Time: 17:19
			
 
				-  To change this template use File | Settings | File Templates.
			
 
				---%>
			
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java"  pageEncoding="UTF-8" %>
			
 
				-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
			
 
				-<%
			
 
				-    String path = request.getContextPath();
			
 
				-    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path;
			
 
				-%>
			
 
				-<jsp:include page="head.jsp"></jsp:include>
			
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-    <base href="<%=basePath%>">
			
 
				-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
			
 
				-    <title>漫步时尚广场</title>
			
 
				-    <link href="css/style.css" rel="stylesheet" type="text/css">
			
 
				-
			
 
				-    <style type="text/css">
			
 
				-        .pic_title {
			
 
				-            background: #ff9c01;
			
 
				-            line-height: 40px;
			
 
				-            text-indent: 20px;
			
 
				-            text-align: left;
			
 
				-            width: 680px;
			
 
				-            float: left;
			
 
				-            color: #fff;
			
 
				-            margin: 0 10px 10px
			
 
				-        }
			
 
				-
			
 
				-        .pic_list {
			
 
				-            float: left
			
 
				-        }
			
 
				-
			
 
				-        .pic_list dl {
			
 
				-            float: left;
			
 
				-            width: 152px;
			
 
				-            margin: 010px 10px
			
 
				-        }
			
 
				-
			
 
				-        .pic_list dl img {
			
 
				-            padding: 5px;
			
 
				-            border: 1px solid #ccc;
			
 
				-            margin-bottom: 10px
			
 
				-        }
			
 
				-
			
 
				-        .pic_list dl dd {
			
 
				-            float: left
			
 
				-        }
			
 
				-
			
 
				-        .right_nav {
			
 
				-            width: 280px;
			
 
				-            border: 1px solid #eee;
			
 
				-            float: right
			
 
				-        }
			
 
				-
			
 
				-        .shop_pic li {
			
 
				-            float: left;
			
 
				-            margin: 0 3px;
			
 
				-        "font-style:normal;" class="hljs-number">20px
			
 
				-        }
			
 
				-
			
 
				-        .shop_pic li p {
			
 
				-            text-align: center;
			
 
				-            color: gray
			
 
				-        }
			
 
				-
			
 
				-        .shop_pic img {
			
 
				-            border: 1px solid #ccc
			
 
				-        }
			
 
				-
			
 
				-        .shop_pic img:hover {
			
 
				-            border: 1px solid #f60
			
 
				-        }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<!--logo和banner start-->
			
 
				-<table width="1200" border="0" cellspacing="0" cellpadding="0" align="center">
			
 
				-    <tr>
			
 
				-        <td height="95">
			
 
				-            <a href="<%=basePath%>/index"><img src="images/logo.jpg"></a>
			
 
				-        </td>
			
 
				-        <td align="right"> <img src="images/banner.jpg"></td>
			
 
				-    </tr>
			
 
				-</table>
			
 
				-<!--logo和banner end-->
			
 
				-<!--菜单导航 start-->
			
 
				-<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#ce2626">
			
 
				-    <tr>
			
 
				-        <td>
			
 
				-            <table width="1200" border="0" cellspacing="0" cellpadding="4" align="center" class="nav_font16">
			
 
				-                <tr>
			
 
				-                    <td width="200">&nbsp;</td>
			
 
				-                    <td width="80" align="center" class="nav_active"> <a href="<%basePath%>/index" class="white">首页</a></td>
			
 
				-                    <td width="100" align="center"><a href="<%=basePath%>/showNew" class="white">最新上架</a></td>
			
 
				-                    <td width="100" align="center">品牌活动</td>
			
 
				-                    <td width="100" align="center">原厂直供</td>
			
 
				-                    <td width="80" align="center">团购</td>
			
 
				-                    <td width="100" align="center">限时抢购</td>
			
 
				-                    <td width="100" align="center">促销打折</td>
			
 
				-                    <td width="200" align="center">&nbsp;</td>
			
 
				-                </tr>
			
 
				-            </table>
			
 
				-        </td>
			
 
				-    </tr>
			
 
				-</table>
			
 
				-<!--菜单导航 end-->
			
 
				-<!--中间部分 start-->
			
 
				-<table width="1200" border="0" align="center" cellpadding="0" cellspacing="0" class="padding-top">
			
 
				-    <tr>
			
 
				-        <td width="220" valign="top">
			
 
				-            <!--购物分类 start-->
			
 
				-            <table width="100%" border="0" cellspacing="1" cellpadding="0" class="table1" bgcolor="#e5e4el">
			
 
				-                <c:forEach items="${goodsType}" var="goodt">
			
 
				-                <tr>
			
 
				-                    <th><a href="<%=basePath%>/shoppingShow?goodTypeId=${goodt.id}">${goodt.typenane}</a></th>
			
 
				-                </tr>
			
 
				-                <c:forEach items="${goodt.subType}" var="st">
			
 
				-                </tr>
			
 
				-                    <%-- <th><a href="<%=basePath%>/shoppingShow?goodTypeId=${st.id}”>${st.typename}</a>
			
 
				-                        </th> --%>
			
 
				-                <td><span class="red_dot"></span>
			
 
				-                    <a href="<%=basePath%>/shoppingShow?goodTypeId=${st.id}">${st.typename}</a>
			
 
				-                    <img src="images/arrow_r.jpg” align=“right">
			
 
				-                </td>
			
 
				-                <tr>
			
 
				-                    </c:forEach>
			
 
				-                    </c:forBach>
			
 
				-            </table>
			
 
				-            <!--购物分类end-->
			
 
				-        </td>
			
 
				-        <td width="716" valign="top">
			
 
				-            <table>
			
 
				-                <tr>
			
 
				-                    <td align="center">
			
 
				-                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
			
 
				-                            <h1 class="pic_title">${goodType.typename } </h1>
			
 
				-                            <div class="pic_list">
			
 
				-                                <c:forEach items="${goodlist}" var="good">
			
 
				-                                    <d1>
			
 
				-                                        <div><img id="${good.id}" src="images/shopshow/${good.gpicture}" /></div>
			
 
				-                                        <dt><span class="price">￥${good.grprice}元</span>
			
 
				-                                            <span class="font12">${good.saleNum} 人购买</span></dt>
			
 
				-                                        <dd>${good.contents}</dd>
			
 
				-                                    </d1>
			
 
				-                                </c:forEach>
			
 
				-                            </div>
			
 
				-                        </table>
			
 
				-                    </td>
			
 
				-                    <td valign="top" width="20%">
			
 
				-
			
 
				-                    </td>
			
 
				-                </tr>
			
 
				-            </table>
			
 
				-
			
 
				-        </td>
			
 
				-    </tr>
			
 
				-    <!--底部 start-->
			
 
				-    <Br/>
			
 
				-</table>
			
 
				-<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#6a6665" height="35" class="foot_bg">
			
 
				-    <tr>
			
 
				-        <td class="padding-top">
			
 
				-            <table width="1200" border="0" align="center" cellpadding="0" cellspacing="0">
			
 
				-                <tr>
			
 
				-                    <td width="20%" align="center"><img src="images/gray1.jpg"></td>
			
 
				-                    <td width="20%" align="center"><img src="images/gray2.jpg"></td>
			
 
				-                    <td width="20%" align="center"><img src="images/gray3.jpg"></td>
			
 
				-                    <td width="20%" align="center"><img src="images/gray4.jpg"></td>
			
 
				-                    <td width="20%" align="center"><img src="images/gray5.jpg"></td>
			
 
				-                </tr>
			
 
				-            </table>
			
 
				-        </td>
			
 
				-    </tr>
			
 
				-    <tr>
			
 
				-        <td bgcolor="#efefef" class="foot_line padding-top">
			
 
				-            <table width="1200" border="0" cellspacing="0" cellpadding="0" align="center">
			
 
				-                <tr>
			
 
				-                    <td align="center" valign="top"><img src="images/red1.jpg"><br>
			
 
				-                        <img src="images/linel.jpg" /></td>
			
 
				-                    <td width="15%" valign="top">
			
 
				-                        <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
			
 
				-                            <tr>
			
 
				-                                <td class="font16 padding-botton">新手指导</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>用户注册</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>电话下单</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>购物流程</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>购物保障</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>服务协议</td>
			
 
				-                            </tr>
			
 
				-                        </table>
			
 
				-                    </td>
			
 
				-                    <td align="center" valign="top"><img src="images/red2.jpg"><br>
			
 
				-                        <img src="images/linel.jpg" /></td>
			
 
				-                    <td width=“15%” valign="top">
			
 
				-                        <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
			
 
				-                            <tr>
			
 
				-                                <td class="font16 padding-bottom">支付方式</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>货到付款</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>商城卡支付</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>支付宝、网银支付</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>优惠券抵用</td>
			
 
				-                            </tr>
			
 
				-                        </table>
			
 
				-                    <td align="center" valign="top"><img src="images/red3.jpg"><br>
			
 
				-                        <img src="images/linel.jpg" /></td>
			
 
				-                    <td width="15%" valign="top">
			
 
				-                        <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
			
 
				-                            <tr>
			
 
				-                                <td>闪电发货</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>满百包邮</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>配送范围及时间</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>商品验收及签收</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>服务协议</td>
			
 
				-                            </tr>
			
 
				-                        </table>
			
 
				-                    </td>
			
 
				-                    <td align="center" valign="top"><img src="images/red4.jpg"><br>
			
 
				-                        <img src="images/linel.jpg" /></td>
			
 
				-                    <td width="15%" valign="top">
			
 
				-                        <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
			
 
				-                            <tr>
			
 
				-                                <td class="font16 padding-bottom">售后服务</td>
			
 
				-                            </tr>
			
 
				-                            <td>退换货协议</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>关于发票</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>退换货流程</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>退换货运费</td>
			
 
				-                            </tr>
			
 
				-                        </table>
			
 
				-                    </td>
			
 
				-                    <td align="center" valign="top"><img src="images/red5.jpg"><br>
			
 
				-                        <img src="images/linel.jpg" /></td>
			
 
				-                    <td width="15%" valign="top">
			
 
				-                        <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
			
 
				-                            <tr>
			
 
				-                                <td class="font16 padding-bottom">关于帐号</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>修改个人信息</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>修改密码</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>找回密码</td>
			
 
				-                            </tr>
			
 
				-                        </table>
			
 
				-                    </td>
			
 
				-                    <td align="center" valign="top"><img src="images/red6.jpg"><br>
			
 
				-                        <img src="images/linel.jpg" /></td>
			
 
				-                    <td width="15%" valign="top">
			
 
				-                        <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
			
 
				-                            <tr>
			
 
				-                                <td class="font16 padding-bottom">优惠活动</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>竞拍须知</td>
			
 
				-                            </tr>
			
 
				-                            <tr>
			
 
				-                                <td>抢购须知</td>
			
 
				-                            </tr>
			
 
				-                        </table>
			
 
				-                    </td>
			
 
				-                </tr>
			
 
				-            </table>
			
 
				-        </td>
			
 
				-    </tr>
			
 
				-    <tr>
			
 
				-        <td bgcolor="#efefef" align="center" class="padding-top">Copyright 2015-2020 0- Walking Fashion E&S 漫步时尚广场（QST教育）版权所 有
			
 
				-            <Br/> 中国青岛 高新区河东路8888号 青软教育集团 咨询热线：400-658-0166 400-658-1022<br/>
			
 
				-            <img src="images/foot_pic.jpg"></td>
			
 
				-    </tr>
			
 
				-</table>
			
 
				-<!--底部end-->
			
 
				-
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/apiguardian-api-1.1.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/apiguardian-api-1.1.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/aspectjweaver-1.9.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/aspectjweaver-1.9.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/commons-fileupload-1.4.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/commons-fileupload-1.4.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/commons-io-2.11.0.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/commons-io-2.11.0.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/druid-1.2.0.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/druid-1.2.0.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/jackson-annotations-2.9.4.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/jackson-annotations-2.9.4.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/jackson-core-2.9.8.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/jackson-core-2.9.8.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/jackson-databind-2.9.8.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/jackson-databind-2.9.8.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-5.8.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-5.8.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-api-5.8.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-api-5.8.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-engine-5.8.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-engine-5.8.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-params-5.8.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-jupiter-params-5.8.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-platform-commons-1.8.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-platform-commons-1.8.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-platform-engine-1.8.2.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/junit-platform-engine-1.8.2.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/mybatis-3.5.7.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/mybatis-3.5.7.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/mybatis-spring-1.3.3.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/mybatis-spring-1.3.3.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/mysql-connector-java-8.0.27.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/mysql-connector-java-8.0.27.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/opentest4j-1.2.0.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/opentest4j-1.2.0.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/protobuf-java-3.11.4.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/protobuf-java-3.11.4.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/servlet-api-2.5.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/servlet-api-2.5.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-jdbc-5.1.16.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-jdbc-5.1.16.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-tx-5.1.16.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-tx-5.1.16.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar
--- a/target/raoyin-1.0-SNAPSHOT/WEB-INF/web.xml
+++ b/target/raoyin-1.0-SNAPSHOT/WEB-INF/web.xml
@@ -1,7 +0,0 @@
 
				-<!DOCTYPE web-app PUBLIC
			
 
				- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
			
 
				- "http://java.sun.com/dtd/web-app_2_3.dtd" >
			
 
				-
			
 
				-<web-app>
			
 
				-  <display-name>Archetype Created Web Application</display-name>
			
 
				-</web-app>
			
--- a/target/raoyin-1.0-SNAPSHOT/comment.html
+++ b/target/raoyin-1.0-SNAPSHOT/comment.html
@@ -1,441 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				-
			
 
				-<head>
			
 
				-    <meta charset="UTF-8">
			
 
				-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				-    <title>Document</title>
			
 
				-</head>
			
 
				-
			
 
				-<style>
			
 
				-    * {
			
 
				-        margin: 0;
			
 
				-        padding: 0;
			
 
				-        list-style-type: none;
			
 
				-        box-sizing: border-box;
			
 
				-    }
			
 
				-    
			
 
				-    .mainBox {
			
 
				-        padding: 0 10%;
			
 
				-    }
			
 
				-    
			
 
				-    .shopkeeper {
			
 
				-        float: left;
			
 
				-        width: 24%;
			
 
				-    }
			
 
				-    
			
 
				-    .comment {
			
 
				-        float: right;
			
 
				-        width: 75%;
			
 
				-    }
			
 
				-    
			
 
				-    .top {
			
 
				-        padding: 10px 20px;
			
 
				-    }
			
 
				-    
			
 
				-    .productList {
			
 
				-        min-height: 140px;
			
 
				-        padding: 15px;
			
 
				-    }
			
 
				-    
			
 
				-    .percent {
			
 
				-        margin-left: 30px;
			
 
				-        width: 10%;
			
 
				-        position: absolute;
			
 
				-        height: 100px;
			
 
				-        font-size: 50px;
			
 
				-        color: rgb(216, 30, 6);
			
 
				-    }
			
 
				-    
			
 
				-    .percent img:nth-child(1) {
			
 
				-        position: absolute;
			
 
				-        top: 10px;
			
 
				-        left: 47px;
			
 
				-        width: 50px;
			
 
				-        height: 50px;
			
 
				-    }
			
 
				-    
			
 
				-    .percent img:nth-child(2) {
			
 
				-        position: absolute;
			
 
				-        bottom: 25px;
			
 
				-        left: -15px;
			
 
				-        width: 25px;
			
 
				-        height: 25px;
			
 
				-        transform: rotate(-20deg);
			
 
				-    }
			
 
				-    
			
 
				-    .label {
			
 
				-        margin-left: 20px;
			
 
				-        float: right;
			
 
				-        width: 75%;
			
 
				-        height: 100%;
			
 
				-    }
			
 
				-    
			
 
				-    .Stag1 {
			
 
				-        border-radius: 15px;
			
 
				-        display: inline-block;
			
 
				-        padding: 5px 10px;
			
 
				-        color: rgb(85, 100, 113);
			
 
				-        transition: all 500ms;
			
 
				-    }
			
 
				-    
			
 
				-    .Stag1:hover {
			
 
				-        background-color: rgb(231, 231, 232);
			
 
				-    }
			
 
				-    
			
 
				-    .content {}
			
 
				-    
			
 
				-    .main {}
			
 
				-    
			
 
				-    .Stag2 {
			
 
				-        display: inline-block;
			
 
				-        padding: 10px 20px;
			
 
				-        color: rgb(85, 100, 113);
			
 
				-        transition: all 500ms;
			
 
				-    }
			
 
				-    
			
 
				-    .Stag2:hover {
			
 
				-        background-color: rgb(231, 231, 232);
			
 
				-        color: rgb(216, 30, 6);
			
 
				-    }
			
 
				-    
			
 
				-    .group {
			
 
				-        border-radius: 15px;
			
 
				-        padding: 10px 20px;
			
 
				-        float: right;
			
 
				-        transition: all 500ms;
			
 
				-    }
			
 
				-    
			
 
				-    .group:hover {
			
 
				-        color: rgb(65, 155, 251);
			
 
				-        background-color: rgb(229, 238, 246);
			
 
				-    }
			
 
				-    
			
 
				-    .box1 {
			
 
				-        display: inline-block;
			
 
				-        font-size: 20px;
			
 
				-        text-align: center;
			
 
				-        height: 25px;
			
 
				-        margin: 10px 0px;
			
 
				-    }
			
 
				-    
			
 
				-    .box1 img {
			
 
				-        width: 20px;
			
 
				-        height: 20px;
			
 
				-        display: inline-block;
			
 
				-        float: right;
			
 
				-        margin-top: 2px;
			
 
				-    }
			
 
				-    
			
 
				-    .shopkeeper .top {
			
 
				-        display: flex;
			
 
				-        justify-content: space-around;
			
 
				-        transition: all 500ms;
			
 
				-    }
			
 
				-    
			
 
				-    .shopkeeper .top:hover {
			
 
				-        background-color: rgb(229, 238, 246);
			
 
				-    }
			
 
				-    
			
 
				-    .score {
			
 
				-        padding: 10px 0px;
			
 
				-        display: flex;
			
 
				-        justify-content: space-around;
			
 
				-        height: 50px;
			
 
				-        transition: all 500ms;
			
 
				-    }
			
 
				-    
			
 
				-    .score:hover {
			
 
				-        background-color: rgb(229, 238, 246);
			
 
				-    }
			
 
				-    
			
 
				-    .box2 {
			
 
				-        display: inline-block;
			
 
				-    }
			
 
				-    
			
 
				-    .score img {
			
 
				-        transform: rotate(-10deg);
			
 
				-        width: 25px;
			
 
				-        height: 25px;
			
 
				-    }
			
 
				-    
			
 
				-    .box2 img:not(:first-of-type) {
			
 
				-        float: left;
			
 
				-    }
			
 
				-    
			
 
				-    .goods {
			
 
				-        margin-top: 30px;
			
 
				-    }
			
 
				-    
			
 
				-    .goods img {
			
 
				-        display: block;
			
 
				-        margin: 0 auto;
			
 
				-        width: 200px;
			
 
				-        height: 200px;
			
 
				-    }
			
 
				-    
			
 
				-    .content2 p {
			
 
				-        padding: 20px 5px;
			
 
				-        width: 80%;
			
 
				-        margin: 0 auto;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-    
			
 
				-    .price {
			
 
				-        padding: 20px 5px;
			
 
				-        margin: 0 auto;
			
 
				-        text-align: center;
			
 
				-        width: 50%;
			
 
				-    }
			
 
				-    /*
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-*/
			
 
				-    /*以下为留言板*/
			
 
				-    
			
 
				-    textarea {
			
 
				-        width: 100%;
			
 
				-        height: 100px;
			
 
				-        border: 1px solid black;
			
 
				-        outline: none;
			
 
				-        resize: none;
			
 
				-        border-radius: 5px;
			
 
				-    }
			
 
				-    
			
 
				-    .btn1 {
			
 
				-        border-radius: 5px;
			
 
				-        width: 80px;
			
 
				-        background-color: #fff;
			
 
				-        border: 1px solid black;
			
 
				-        padding: 10px;
			
 
				-    }
			
 
				-    
			
 
				-    ul {
			
 
				-        margin-top: 50px;
			
 
				-    }
			
 
				-    
			
 
				-    li {
			
 
				-        padding: 20px;
			
 
				-        font-size: 14px;
			
 
				-        margin: 15px 0;
			
 
				-        border-top: 1px solid black;
			
 
				-    }
			
 
				-    
			
 
				-    li a {
			
 
				-        color: rgba(175, 175, 175, 1);
			
 
				-        float: right;
			
 
				-        text-decoration: none;
			
 
				-    }
			
 
				-</style>
			
 
				-
			
 
				-<body>
			
 
				-
			
 
				-    <div class="mainBox">
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-        <div class="shopkeeper">
			
 
				-
			
 
				-            <div class="top">
			
 
				-                <div class="box1">
			
 
				-                    Gun Smith
			
 
				-                    <img src="icon/checkMark.png" alt="">
			
 
				-                </div>
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="score">
			
 
				-                <div class="box2">
			
 
				-                    <img src="icon/star.png" alt="">
			
 
				-                    <img src="icon/star.png" alt="">
			
 
				-                    <img src="icon/star.png" alt="">
			
 
				-                    <img src="icon/star.png" alt="">
			
 
				-                    <img src="icon/star.png" alt="">
			
 
				-                </div>
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="goods">
			
 
				-                <img src="icon/goods.png" alt="">
			
 
				-
			
 
				-                <div class="content2">
			
 
				-                    <p>content content content content content</p>
			
 
				-                </div>
			
 
				-
			
 
				-                <div class="price">
			
 
				-                    999$
			
 
				-                </div>
			
 
				-
			
 
				-            </div>
			
 
				-
			
 
				-
			
 
				-            <div class="goods">
			
 
				-                <img src="icon/goods.png" alt="">
			
 
				-
			
 
				-                <div class="content2">
			
 
				-                    <p>content content content content content</p>
			
 
				-                </div>
			
 
				-
			
 
				-                <div class="price">
			
 
				-                    999$
			
 
				-                </div>
			
 
				-
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="goods">
			
 
				-                <img src="icon/goods.png" alt="">
			
 
				-
			
 
				-                <div class="content2">
			
 
				-                    <p>content content content content content</p>
			
 
				-                </div>
			
 
				-
			
 
				-                <div class="price">
			
 
				-                    999$
			
 
				-                </div>
			
 
				-
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="goods">
			
 
				-                <img src="icon/goods.png" alt="">
			
 
				-
			
 
				-                <div class="content2">
			
 
				-                    <p>content content content content content</p>
			
 
				-                </div>
			
 
				-
			
 
				-                <div class="price">
			
 
				-                    999$
			
 
				-                </div>
			
 
				-
			
 
				-            </div>
			
 
				-
			
 
				-        </div>
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-        <div class="comment">
			
 
				-
			
 
				-
			
 
				-
			
 
				-            <div class="top">
			
 
				-                <h3>Comment List</h3>
			
 
				-            </div>
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-            <div class="productList">
			
 
				-
			
 
				-
			
 
				-                <div class="percent">
			
 
				-                    98
			
 
				-                    <img src="icon/percent.png" alt="">
			
 
				-
			
 
				-                    <img src="icon/thumpsUp.png" alt="">
			
 
				-
			
 
				-                </div>
			
 
				-
			
 
				-
			
 
				-
			
 
				-                <div class="label">
			
 
				-                    <span class="Stag1">content</span>
			
 
				-                    <span class="Stag1">contentcontentcontent</span>
			
 
				-                    <span class="Stag1">content</span>
			
 
				-                    <span class="Stag1">content</span>
			
 
				-                    <span class="Stag1">content</span>
			
 
				-                    <span class="Stag1">content</span>
			
 
				-                    <span class="Stag1">content</span>
			
 
				-                    <span class="Stag1">content</span>
			
 
				-                </div>
			
 
				-
			
 
				-
			
 
				-
			
 
				-            </div>
			
 
				-
			
 
				-
			
 
				-            <div class="content">
			
 
				-
			
 
				-                <div class="main">
			
 
				-                    <span class="Stag2">全部评价</span>
			
 
				-                    <span class="Stag2">晒图</span>
			
 
				-                    <span class="Stag2">视频晒单</span>
			
 
				-                    <span class="Stag2">追评</span>
			
 
				-                    <span class="Stag2">好评</span>
			
 
				-                    <span class="Stag2">中评</span>
			
 
				-                    <span class="Stag2">差评</span>
			
 
				-
			
 
				-                    <div class="group">
			
 
				-                        content
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-
			
 
				-
			
 
				-
			
 
				-            </div>
			
 
				-
			
 
				-
			
 
				-
			
 
				-            <!--魏葆聪de留言板功能-->
			
 
				-            <textarea name="" id=""></textarea>
			
 
				-
			
 
				-            <button class="btn1">发布</button>
			
 
				-
			
 
				-            <ul></ul>
			
 
				-            <!--至此-->
			
 
				-
			
 
				-        </div>
			
 
				-
			
 
				-
			
 
				-    </div>
			
 
				-
			
 
				-
			
 
				-
			
 
				-    <script>
			
 
				-        var btn = document.querySelector('button');
			
 
				-        var text = document.querySelector('textarea');
			
 
				-        var ul = document.querySelector('ul');
			
 
				-
			
 
				-        btn.onclick = function() {
			
 
				-
			
 
				-            if (text.value == '') {
			
 
				-                alert('你没有输入内容');
			
 
				-                return false;
			
 
				-
			
 
				-            } else {
			
 
				-
			
 
				-                var li = document.createElement('li');
			
 
				-
			
 
				-                li.innerHTML = text.value + '<a href="javascript:;">Delete</a>';
			
 
				-
			
 
				-                ul.insertBefore(li, ul.children[0]);
			
 
				-
			
 
				-                var as = document.querySelectorAll('a');
			
 
				-
			
 
				-                text.value = ''
			
 
				-
			
 
				-                for (var i = 0; i < as.length; i++) {
			
 
				-
			
 
				-                    as[i].onclick = function() {
			
 
				-
			
 
				-                        ul.removeChild(this.parentNode);
			
 
				-
			
 
				-                    };
			
 
				-
			
 
				-                }
			
 
				-
			
 
				-            }
			
 
				-        }
			
 
				-    </script>
			
 
				-
			
 
				-
			
 
				-
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/target/raoyin-1.0-SNAPSHOT/css/CartCss.css
+++ b/target/raoyin-1.0-SNAPSHOT/css/CartCss.css
@@ -1,178 +0,0 @@
 
				-
			
 
				-body{
			
 
				-    /* background-color: transparent; */
			
 
				-    position: relative;
			
 
				-    margin: 0;
			
 
				-    font-family: 'Harmony SC';
			
 
				-    min-height: 100px;
			
 
				-    background-color: whitesmoke;
			
 
				-}
			
 
				-
			
 
				-form
			
 
				-{
			
 
				-    border-radius: 10px;
			
 
				-    /* position: relative; */
			
 
				-    width: 100%;
			
 
				-    min-height: 100px;
			
 
				-    /* min-width: 500px; */
			
 
				-}
			
 
				-form>div.Store
			
 
				-{
			
 
				-    position: relative;
			
 
				-    margin-top: 10px;
			
 
				-    margin-left: 15px;
			
 
				-    margin-right: 15px;
			
 
				-    border-radius: 10px;
			
 
				-    background-color: white;
			
 
				-    font-size: 16px;
			
 
				-    overflow: hidden;
			
 
				-}
			
 
				-/* div#Cartlist>div.Store:last-child
			
 
				-{
			
 
				-    margin-bottom: 0;
			
 
				-} */
			
 
				-form>div.Store>*{
			
 
				-    border-bottom: 1px solid gainsboro;
			
 
				-}
			
 
				-
			
 
				-form>div.Store>*:last-child{
			
 
				-    border-bottom: 0;
			
 
				-}
			
 
				-
			
 
				-form>div.Store>a#lable
			
 
				-{
			
 
				-    height: 48px;
			
 
				-    line-height: 48px;
			
 
				-    display: flex;
			
 
				-    justify-items: center;
			
 
				-    overflow: hidden;
			
 
				-    background-color: transparent;
			
 
				-}
			
 
				-form>div.Store>a#lable>input
			
 
				-{
			
 
				-    height: 24px;
			
 
				-    width: 24px;
			
 
				-    margin: 12px;
			
 
				-    margin-left: calc(1ch + 12px);
			
 
				-}
			
 
				-form>div.Store>a#lable>div#StoreIcon
			
 
				-{
			
 
				-    height: 40px;
			
 
				-    width: 40px;
			
 
				-    margin: 4px;
			
 
				-    margin-left: calc(1ch + 4px);
			
 
				-    text-align: center;
			
 
				-}
			
 
				-form>div.Store>a#lable>div#StoreIcon>img
			
 
				-{
			
 
				-    max-width: 100%;
			
 
				-    max-height: 100%;
			
 
				-}
			
 
				-form>div.Store>a#lable>h3
			
 
				-{
			
 
				-    margin: 0;
			
 
				-}
			
 
				-
			
 
				-form>div.Store>div.goods{
			
 
				-    height: 96px;
			
 
				-    display: flex;
			
 
				-    justify-items: center;
			
 
				-    overflow: hidden;
			
 
				-    background-color:transparent;
			
 
				-}
			
 
				-form>div.Store>div.goods>input{
			
 
				-    height: 24px;
			
 
				-    min-width: 24px;
			
 
				-    margin: 36px;
			
 
				-    margin-left: calc(1ch + 12px);
			
 
				-    margin-right: calc(1ch + 12px);
			
 
				-}
			
 
				-form>div.Store>div.goods>div#GoodsIcon
			
 
				-{
			
 
				-    height: 88px;
			
 
				-    min-width: 88px;
			
 
				-    margin: 4px;
			
 
				-    margin-left: calc(1ch + 4px);
			
 
				-    text-align: center;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#GoodsIcon>img
			
 
				-{
			
 
				-    max-width: 100%;
			
 
				-    max-height: 100%;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp
			
 
				-{
			
 
				-    position: relative;
			
 
				-    margin: 8px;
			
 
				-    height: 80px;
			
 
				-    width: 100%;
			
 
				-    min-width: 200px;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>*
			
 
				-{
			
 
				-    width: 100%;
			
 
				-    margin: 0;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>p{
			
 
				-    color:gray;
			
 
				-
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>h4{
			
 
				-    color:#E33333;
			
 
				-    position: absolute;
			
 
				-    bottom: 0;
			
 
				-    left: 0;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>h4::after{
			
 
				-    counter-reset: "$";
			
 
				-    color: #E33333;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>div#count
			
 
				-{
			
 
				-    position: absolute;
			
 
				-    width: 25%;
			
 
				-    min-width: 16ch;
			
 
				-    height: 24px;
			
 
				-    border-radius: 10px;
			
 
				-    border: 1px solid gray;
			
 
				-    margin: 0;
			
 
				-    bottom: 0;
			
 
				-    right: 0;
			
 
				-    display: flex;
			
 
				-    overflow: hidden;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>div#count>*{
			
 
				-    width: 100%;
			
 
				-    height: 100%;
			
 
				-    margin: 0;
			
 
				-    padding: 0;
			
 
				-    border: 0;
			
 
				-    outline: 1px solid gray;
			
 
				-    text-align: center;
			
 
				-    background-color: white;
			
 
				-    user-select: none;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>div#count>*:hover
			
 
				-{
			
 
				-    background-color: gainsboro;
			
 
				-}
			
 
				-form>div.Store>div.goods>div#exp>div#count>*:active
			
 
				-{
			
 
				-    background-color: gray;
			
 
				-}
			
 
				-
			
 
				-form>div#BottomBar
			
 
				-{
			
 
				-    position: fixed;
			
 
				-    right: 0;
			
 
				-    bottom: 0;
			
 
				-    width: 100%;
			
 
				-
			
 
				-}
			
 
				-
			
 
				-
			
 
				-@font-face
			
 
				-{
			
 
				-    font-family: 'Harmony SC';
			
 
				-    src: url(../fonts/HarmonyOS_Sans_SC_Medium.ttf);
			
 
				-}
			
--- a/target/raoyin-1.0-SNAPSHOT/css/backTop.css
+++ b/target/raoyin-1.0-SNAPSHOT/css/backTop.css
@@ -1,18 +0,0 @@
 
				-#myBtn {
			
 
				-    position: fixed;
			
 
				-    bottom: 35px;
			
 
				-    right: 35px;
			
 
				-    z-index: 99;
			
 
				-    border: 2px solid black;
			
 
				-    outline: none;
			
 
				-    color: black;
			
 
				-    cursor: pointer;
			
 
				-    padding: 15px;
			
 
				-    border-radius: 5px;
			
 
				-    transition: all 500ms;
			
 
				-}
			
 
				-
			
 
				-#myBtn:hover {
			
 
				-    background-color: #555;
			
 
				-    color: aliceblue;
			
 
				-}