Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	target/classes/WebsiteES/WebApp.class
#	target/test-classes/test.class
yangrenwei 3 years ago
parent
commit
283c19aa05

+ 27 - 121
.idea/workspace.xml

@@ -4,144 +4,57 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0e73f9ce-e579-4dde-9c5a-5dcc9ebae806" name="变更" comment="" />
+    <list default="true" id="84c8d623-cca5-43bb-85a8-242b705dd4be" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/WebApp.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/WebApp.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Goods.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Goods.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/GoodsMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/GoodsMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Selection.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Selection.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/SelectionMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/SelectionMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Store.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Store.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/StoreMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/StoreMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Useraccount.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/Useraccount.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountKey.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountKey.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/WebsiteES/myBatis/UseraccountMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/group04/myBatis/Nodeinfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/group04/myBatis/Nodeinfo.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/group04/myBatis/NodeinfoMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/group04/myBatis/NodeinfoMapper.class" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ComposerSettings">
-    <execution />
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="ProjectId" id="22u1yH5L9f9u9JHqDRvD3843aDh" />
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
+  <component name="ProjectId" id="22rT0ZxNg62hjbvh9q0Zv7FsSik" />
   <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
-    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../桌面/shop-master" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="jdk.selected.JAVA_MODULE" value="15" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="0e73f9ce-e579-4dde-9c5a-5dcc9ebae806" name="变更" comment="" />
-      <created>1640672914324</created>
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="84c8d623-cca5-43bb-85a8-242b705dd4be" name="Default Changelist" comment="" />
+      <created>1640594486664</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1640672914324</updated>
-      <workItem from="1640672916730" duration="2121000" />
-      <workItem from="1640675271656" duration="4551000" />
-      <workItem from="1640701294927" duration="278000" />
-      <workItem from="1640756371703" duration="371000" />
-      <workItem from="1640756789641" duration="9753000" />
-    </task>
-    <task id="LOCAL-00001" summary="1">
-      <created>1640756954996</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1640756954996</updated>
-    </task>
-    <task id="LOCAL-00002" summary="1">
-      <created>1640757426683</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1640757426683</updated>
-    </task>
-    <task id="LOCAL-00003" summary="1">
-      <created>1640757596322</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1640757596322</updated>
-    </task>
-    <task id="LOCAL-00004" summary="1">
-      <created>1640757747533</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1640757747533</updated>
-    </task>
-    <task id="LOCAL-00005" summary="1">
-      <created>1640758198329</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1640758198329</updated>
-    </task>
-    <task id="LOCAL-00006" summary="1">
-      <created>1640758370904</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1640758370904</updated>
+      <updated>1640594486664</updated>
+      <workItem from="1640594489289" duration="1828000" />
+      <workItem from="1640765989014" duration="1991000" />
+      <workItem from="1640843215429" duration="425000" />
+      <workItem from="1640845222643" duration="9000" />
+      <workItem from="1640848253156" duration="397000" />
     </task>
-    <task id="LOCAL-00007" summary="1">
-      <created>1640762244433</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1640762244433</updated>
-    </task>
-    <task id="LOCAL-00008" summary="122">
-      <created>1640763861810</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1640763861810</updated>
-    </task>
-    <task id="LOCAL-00009" summary="122">
-      <created>1640765443836</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1640765443836</updated>
-    </task>
-    <task id="LOCAL-00010" summary="122">
-      <created>1640765600855</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1640765600855</updated>
-    </task>
-    <task id="LOCAL-00011" summary="122">
-      <created>1640765809810</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1640765809810</updated>
-    </task>
-    <task id="LOCAL-00012" summary="122">
-      <created>1640843097656</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1640843097657</updated>
-    </task>
-    <task id="LOCAL-00013" summary="添加了tab栏">
-      <created>1640852808474</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1640852808474</updated>
-    </task>
-    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -159,11 +72,4 @@
     </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="1" />
-    <MESSAGE value="122" />
-    <MESSAGE value="添加了tab栏" />
-    <option name="LAST_COMMIT_MESSAGE" value="添加了tab栏" />
-  </component>
 </project>

+ 6 - 1
pom.xml

@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
@@ -113,6 +113,11 @@
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
 
     </dependencies>
 

+ 24 - 13
src/main/java/WebsiteES/WebApp.java

@@ -21,8 +21,9 @@ public class WebApp {
     public String login(String email, String password, HttpSession session, Model model) throws IOException
     {
         Useraccount user = UserDao.getUseraccountMapper().selectByPrimaryKey(email);
-        if(user.getPassword().equals(password))
+        if(user != null && user.getPassword().equals(password))
         {
+            session.setAttribute("user", user);
             String srcURL = (String) session.getAttribute("srcURL");
             if(srcURL != null)
             {
@@ -40,20 +41,30 @@ public class WebApp {
     @RequestMapping("register")
     public String register(String email, String password, HttpSession session, Model model) throws IOException
     {
-        Useraccount user = UserDao.getUseraccountMapper().selectByPrimaryKey(email);
-        if(user != null)
-        {
-            model.addAttribute("msg", "email has been used");
-            return "register";
-        }
-        else
+        if(email != null && password != null)
         {
-            user = new Useraccount();
-            user.setEmail(email);
-            user.setPassword(password);
-            UserDao.getUseraccountMapper().insert(user);
-            return "redirect:loginPage";
+            if(password.length() <= 16 && password.length() > 8)
+            {
+                Useraccount user = UserDao.getUseraccountMapper().selectByPrimaryKey(email);
+                if(user != null)
+                {
+                    model.addAttribute("msg", "email has been used");
+                }
+                else
+                {
+                    user = new Useraccount();
+                    user.setEmail(email);
+                    user.setPassword(password);
+                    UserDao.getUseraccountMapper().insert(user);
+                    return "redirect:login";
+                }
+            }
+            else
+            {
+                model.addAttribute("msg", "invaildity password");
+            }
         }
+        return "register";
     }
 
 }

+ 8 - 8
src/main/resources/generatorConfig.xml

@@ -33,35 +33,35 @@
         </javaClientGenerator>
 
         <table
-                tableName="userAccount"
+            tableName="userAccount"
         />
 
         <table
-                tableName="user_cart"
+            tableName="user_cart"
         />
 
         <table
-                tableName="user_collect"
+            tableName="user_collect"
         />
 
         <table
-                tableName="store"
+            tableName="store"
         />
 
         <table
-                tableName="goods"
+            tableName="goods"
         />
 
         <table
-                tableName="selection_group"
+            tableName="selection_group"
         />
 
         <table
-                tableName="selection"
+            tableName="selection"
         />
 
         <table
-                tableName="comment"
+            tableName="comment"
         />
     </context>
 </generatorConfiguration>

+ 8 - 8
src/main/resources/springmvc-config.xml

@@ -45,12 +45,12 @@
 
     <mvc:annotation-driven/>
     <mvc:default-servlet-handler/>
-       <mvc:interceptors>
-           <mvc:interceptor>
-               <mvc:mapping path="/*"/>
-               <mvc:exclude-mapping path="/logiin"/>
-               <mvc:exclude-mapping path="/regist"/>
-               <bean id="InterceptorLogin" class="WebsiteES.InterceptorLogin"/>
-           </mvc:interceptor>
-       </mvc:interceptors>
+    <!-- <mvc:interceptors>
+        <mvc:interceptor>
+            <mvc:mapping path="/*"/>
+            <mvc:exclude-mapping path="/login"/>
+            <mvc:exclude-mapping path="/regist"/>
+            <bean id="InterceptorLogin" class="WebsiteES.InterceptorLogin"/>
+        </mvc:interceptor>
+    </mvc:interceptors> -->
 </beans>

+ 72 - 4
src/main/webapp/WEB-INF/web.xml

@@ -1,7 +1,75 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<?xml version="1.0" encoding="UTF-8"?>
 
-<web-app>
+<web-app
+  version="2.4" 
+  xmlns="http://java.sun.com/xml/ns/j2ee" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
   <display-name>Archetype Created Web Application</display-name>
+  <servlet>
+    <servlet-name>dispatcherServlet</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>classpath:springmvc-config.xml</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>dispatcherServlet</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <filter>
+    <filter-name>CharacterEncode</filter-name>
+    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>CharacterEncode</filter-name>
+    <url-pattern>/</url-pattern>
+  </filter-mapping>
+
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+  
+  <jsp-config>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri>
+      <taglib-location>/WEB-INF/fmt.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/fmt-rt</taglib-uri>
+      <taglib-location>/WEB-INF/fmt-rt.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
+      <taglib-location>/WEB-INF/c.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/core-rt</taglib-uri>
+      <taglib-location>/WEB-INF/c-rt.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/sql</taglib-uri>
+      <taglib-location>/WEB-INF/sql.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/sql-rt</taglib-uri>
+      <taglib-location>/WEB-INF/sql-rt.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/x</taglib-uri>
+      <taglib-location>/WEB-INF/x.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>http://java.sun.com/jsp/jstl/x-rt</taglib-uri>
+      <taglib-location>/WEB-INF/x-rt.tld</taglib-location>
+    </taglib>
+    </jsp-config>
 </web-app>

+ 0 - 1
src/main/webapp/debug.log

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

+ 0 - 749
src/main/webapp/index.html

@@ -1,749 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-<head>
-    <meta charset="UTF-8">
-    <title>品优购-综合网购首选-正品低价、品质保障、配送及时、轻松购物!</title>
-    <meta name="description" content="品优购JD.COM-专业的综合网上购物商城,销售家电、数码通讯、电脑、家居百货、服装服饰、母婴、图书、食品等数万个品牌优质商品.便捷、诚信的服务,为您提供愉悦的网上购物体验!" />
-    <meta name="Keywords" content="网上购物,网上商城,手机,笔记本,电脑,MP3,CD,VCD,DV,相机,数码,配件,手表,存储卡,品优购" />
-    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" href="css/base.css">
-    <link rel="stylesheet" href="css/common.css">
-    <link rel="stylesheet" href="css/index.css">
-    <link rel="stylesheet" href="css/backTop.css">
-    <script src="js/jquery.min.js"></script>
-    <script src="js/index.js"></script>
-</head>
-
-<body>
-    <div class="shortcut">
-        <div class="w">
-            <div class="fl">
-                <ul>
-                    <li>品优购欢迎您!</li>
-                    <li>
-                        <a href="loginPage.html">请登录</a>&nbsp;<a href="register.html" class="style_red">免费注册</a>
-                    </li>
-                </ul>
-            </div>
-            <div class="fr">
-                <ul>
-                    <li><a href="#">我的订单</a></li>
-                    <li class="spacer"></li>
-                    <li>
-                        <a href="#">我的品优购</a>
-                        <i class="icomoon"></i>
-                    </li>
-                    <li class="spacer"></li>
-                    <li><a href="#">品优购会员</a></li>
-                    <li class="spacer"></li>
-                    <li><a href="#">企业采购</a></li>
-                    <li class="spacer"></li>
-                    <li><a href="#">关注品优购</a> <i class="icomoon"></i></li>
-                    <li class="spacer"></li>
-                    <li><a href="#">客户服务</a> <i class="icomoon"></i></li>
-                    <li class="spacer"></li>
-                    <li><a href="#">网站导航</a> <i class="icomoon"></i></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-    
-    <div class="header w">
-        <div class="logo">
-            <h1>
-                <a href="index.html" title="品优购">品优购</a>
-            </h1>
-        </div>
-        <div class="search">
-            <input type="text" class="text" value="请搜索内容...">
-            <button class="btn">搜索</button>
-        </div>
-        <div class="hotwrods">
-            <a href="#" class="style-red">优惠购首发</a>
-            <a href="#">亿元优惠</a>
-            <a href="#">9.9元团购</a>
-            <a href="#">美满99减30</a>
-            <a href="#">办公用品</a>
-            <a href="#">电脑</a>
-            <a href="#">通信</a>
-        </div>
-        <div class="shopcar">
-            <i class="car"> </i> <i class="arrow">  </i>
-            <a href="../../gwc/gwc.html" title="我的购物车">我的购物车</a>
-            <i class="count">80</i>
-        </div>
-    </div>
-
-    <div class="nav">
-        <div class="w">
-            <div class="dropdown fl">
-                <div class="dt"> 品优购 </div>
-                <div class="dd">
-                    <ul>
-                        <li class="menu_item"><a href="a">所有商品</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="ten/list.html">十大人气商品排行</a><i>  </i></li>
-                        <li class="menu_item"><a href="ten/list.html">十大销售商品排行</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">家居、家具、家装、厨具</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">男装、女装、童装、内衣</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">个户化妆、清洁用品、宠物</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">鞋靴、箱包、珠宝、奢侈品</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">运动户外、钟表</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">汽车、汽车用品</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">母婴、玩具乐器</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">食品、酒类、生鲜、特产</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">医药保健</a> <i>  </i> </li>
-                        <li class="menu_item"><a href="#">图书、音像、电子书</a> <i> </i> </li>
-                        <li class="menu_item"><a href="#">彩票、旅行、充值、票务</a> <i> </i> </li>
-                        <li class="menu_item"><a href="#">理财、众筹、白条、保险</a> <i>  </i> </li>
-                    </ul>
-                </div>
-            </div>
-         
-            <div class="navitems fl">
-                <ul>
-                    <li><a href="#">服装城</a></li>
-                    <li><a href="#">美妆馆</a></li>
-                    <li><a href="#">传智超市</a></li>
-                    <li><a href="#">全球购</a></li>
-                    <li><a href="#">闪购</a></li>
-                    <li><a href="#">团购</a></li>
-                    <li><a href="#">拍卖</a></li>
-                    <li><a href="#">有趣</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-   
-    <div class="w">
-        <div class="main">
-            <div class="focus fl">
-                <a href="javascript:;" class="arrow-l">
-                    &lt;
-                 </a>
-                <a href="javascript:;" class="arrow-r">  </a>
-                <ul>
-                    <li>
-                        <a href="#"><img src="upload/focus.jpg" alt=""></a>
-                    </li>
-                    <li>
-                        <a href="#"><img src="upload/focus1.jpg" alt=""></a>
-                    </li>
-                    <li>
-                        <a href="#"><img src="upload/focus2.jpg" alt=""></a>
-                    </li>
-                    <li>
-                        <a href="#"><img src="upload/focus3.jpg" alt=""></a>
-                    </li>
-                </ul>
-                <ol class="circle">
-
-                </ol>
-            </div>
-            <div class="newsflash fr">
-                <div class="news">
-                    <div class="news-hd">
-                        品优购快报
-                        <a href="https://news.hao123.com/wangzhi">更多</a>
-                    </div>
-                    <div class="news-bd">
-                        <ul>
-                        <li><a href="#"><strong>[公告]</strong> 已上线苹果20,快来抢购。</a></li>
-                        <li><a href="#"><strong>[公告]</strong> 中国即将进口各国的蔬菜水果。</a></li>
-                        <li><a href="#"><strong>[公告]</strong> 互联网将在明年有大变动。</a></li>
-                        <li><a href="#"><strong>[公告]</strong> 北京大兴国际机场今日试飞。</a></li>
-                        <li><a href="#"><strong>[公告]</strong> 白宫以"不合作战略"应对国会调查。</a></li>
-                        </ul>
-                    </div>
-                </div>
-                <div class="lifeservice">
-                    <ul>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_huafei"></i>
-                                <p>话费</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                            <span class="hot"></span>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="service_ico service_ico_feiji"></i>
-                                <p>机票</p>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="bargain">
-                    <img src="upload/bargain.jpg" alt="">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="recommend w">
-        <div class="recom-hd fl">
-            <img src="img/clock.png" alt="">
-            <h3>今日推荐</h3>
-        </div>
-        <div class="recom-bd fl">
-            <ul>
-                <li>
-                    <a href="#">
-                        <img src="upload/pic.jpg" alt="">
-                    </a>
-                </li>
-                <li>
-                    <a href="#">
-                        <img src="upload/pic.jpg" alt="">
-                    </a>
-                </li>
-                <li>
-                    <a href="#">
-                        <img src="upload/pic.jpg" alt="">
-                    </a>
-                </li>
-                <li class="last">
-                    <a href="#">
-                        <img src="upload/pic.jpg" alt="">
-                    </a>
-                </li>
-
-            </ul>
-        </div>
-    </div>
- 
-    <div class="floor">
-        <div class="jiadian w">
-            <div class="box-hd">
-                <h3>家用电器</h3>
-                <div class="tab-list">
-                    <ul>
-                        <li><a href="#" class="style-red">热门</a>|</li>
-                        <li><a href="#">大家电</a>|</li>
-                        <li><a href="#">生活电器</a>|</li>
-                        <li><a href="#">厨房电器</a>|</li>
-                        <li><a href="#">个护健康</a>|</li>
-                        <li><a href="#">应季电器</a>|</li>
-                        <li><a href="#">空气/净水</a>|</li>
-                        <li><a href="#">新奇特</a>|</li>
-                        <li><a href="#">高端电器</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="box-bd">
-                <ul class="tab-con">
-                    <li class="w209">
-                        <ul class="tab-con-list">
-                            <li>
-                                <a href="#">节能补贴</a>
-                            </li>
-                            <li>
-                                <a href="#">4K电视</a>
-                            </li>
-                            <li>
-                                <a href="#">空气净化器</a>
-                            </li>
-                            <li>
-                                <a href="#">IH电饭煲</a>
-                            </li>
-                            <li>
-                                <a href="#">滚筒洗衣机</a>
-                            </li>
-                            <li>
-                                <a href="#">电热水器</a>
-                            </li>
-                        </ul>
-                        <img src="upload/floor-1-1.png" alt="">
-                    </li>
-                    <li class="w329">
-                        <img src="upload/pic1.jpg" alt="">
-                    </li>
-                    <li class="w219">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-2.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-3.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-4.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-5.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-6.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                </ul>
-               
-            </div>
-        </div>
-        <div class="shouji w">
-            <div class="box-hd">
-                <h3>手机通讯</h3>
-                <div class="tab-list">
-                    <ul>
-                        <li><a href="#" class="style-red">热门</a>|</li>
-                        <li><a href="#">大家电</a>|</li>
-                        <li><a href="#">生活电器</a>|</li>
-                        <li><a href="#">厨房电器</a>|</li>
-                        <li><a href="#">个护健康</a>|</li>
-                        <li><a href="#">应季电器</a>|</li>
-                        <li><a href="#">空气/净水</a>|</li>
-                        <li><a href="#">新奇特</a>|</li>
-                        <li><a href="#">高端电器</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="box-bd">
-                <ul class="tab-con">
-                    <li class="w209">
-                        <ul class="tab-con-list">
-                            <li>
-                                <a href="#">节能补贴</a>
-                            </li>
-                            <li>
-                                <a href="#">4K电视</a>
-                            </li>
-                            <li>
-                                <a href="#">空气净化器</a>
-                            </li>
-                            <li>
-                                <a href="#">IH电饭煲</a>
-                            </li>
-                            <li>
-                                <a href="#">滚筒洗衣机</a>
-                            </li>
-                            <li>
-                                <a href="#">电热水器</a>
-                            </li>
-                        </ul>
-                        <img src="upload/floor-1-1.png" alt="">
-                    </li>
-                    <li class="w329">
-                        <img src="upload/pic1.jpg" alt="">
-                    </li>
-                    <li class="w219">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-2.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-3.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-4.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-5.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-6.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                </ul>
-
-            </div>
-        </div>
-        <div class="diannao w">
-            <div class="box-hd">
-                <h3>电脑办公</h3>
-                <div class="tab-list">
-                    <ul>
-                        <li><a href="#" class="style-red">热门</a>|</li>
-                        <li><a href="#">大家电</a>|</li>
-                        <li><a href="#">生活电器</a>|</li>
-                        <li><a href="#">厨房电器</a>|</li>
-                        <li><a href="#">个护健康</a>|</li>
-                        <li><a href="#">应季电器</a>|</li>
-                        <li><a href="#">空气/净水</a>|</li>
-                        <li><a href="#">新奇特</a>|</li>
-                        <li><a href="#">高端电器</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="box-bd">
-                <ul class="tab-con">
-                    <li class="w209">
-                        <ul class="tab-con-list">
-                            <li>
-                                <a href="#">节能补贴</a>
-                            </li>
-                            <li>
-                                <a href="#">4K电视</a>
-                            </li>
-                            <li>
-                                <a href="#">空气净化器</a>
-                            </li>
-                            <li>
-                                <a href="#">IH电饭煲</a>
-                            </li>
-                            <li>
-                                <a href="#">滚筒洗衣机</a>
-                            </li>
-                            <li>
-                                <a href="#">电热水器</a>
-                            </li>
-                        </ul>
-                        <img src="upload/floor-1-1.png" alt="">
-                    </li>
-                    <li class="w329">
-                        <img src="upload/pic1.jpg" alt="">
-                    </li>
-                    <li class="w219">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-2.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-3.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-4.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-5.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-6.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                </ul>
-       
-            </div>
-        </div>
-        <div class="jiaju w">
-            <div class="box-hd">
-                <h3>精品家具</h3>
-                <div class="tab-list">
-                    <ul>
-                        <li><a href="#" class="style-red">热门</a>|</li>
-                        <li><a href="#">大家电</a>|</li>
-                        <li><a href="#">生活电器</a>|</li>
-                        <li><a href="#">厨房电器</a>|</li>
-                        <li><a href="#">个护健康</a>|</li>
-                        <li><a href="#">应季电器</a>|</li>
-                        <li><a href="#">空气/净水</a>|</li>
-                        <li><a href="#">新奇特</a>|</li>
-                        <li><a href="#">高端电器</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="box-bd">
-                <ul class="tab-con">
-                    <li class="w209">
-                        <ul class="tab-con-list">
-                            <li>
-                                <a href="#">节能补贴</a>
-                            </li>
-                            <li>
-                                <a href="#">4K电视</a>
-                            </li>
-                            <li>
-                                <a href="#">空气净化器</a>
-                            </li>
-                            <li>
-                                <a href="#">IH电饭煲</a>
-                            </li>
-                            <li>
-                                <a href="#">滚筒洗衣机</a>
-                            </li>
-                            <li>
-                                <a href="#">电热水器</a>
-                            </li>
-                        </ul>
-                        <img src="upload/floor-1-1.png" alt="">
-                    </li>
-                    <li class="w329">
-                        <img src="upload/pic1.jpg" alt="">
-                    </li>
-                    <li class="w219">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-2.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-3.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-4.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                    <li class="w220">
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-5.png" alt="">
-                            </a>
-                        </div>
-                        <div class="tab-con-item">
-                            <a href="#">
-                                <img src="upload/floor-1-6.png" alt="">
-                            </a>
-                        </div>
-                    </li>
-                </ul>
-              
-            </div>
-        </div>
-    </div>
-
-    <div class="fixedtool">
-        <ul>
-            <li class="current">家用电器</li>
-            <li>手机通讯</li>
-            <li>电脑办公</li>
-            <li>精品家具</li>
-
-        </ul>
-    </div>
-    <div class="footer">
-        <div class="w">
-            <div class="mod_service">
-                <ul>
-                    <li>
-                        <i class="mod-service-icon mod_service_zheng"></i>
-                        <div class="mod_service_tit">
-                            <h5>正品保障</h5>
-                            <p>正品保障,提供发票</p>
-                        </div>
-                    </li>
-                    <li>
-                        <i class="mod-service-icon mod_service_kuai"></i>
-                        <div class="mod_service_tit">
-                            <h5>正品保障</h5>
-                            <p>正品保障,提供发票</p>
-                        </div>
-                    </li>
-                    <li>
-                        <i class="mod-service-icon mod_service_bao"></i>
-                        <div class="mod_service_tit">
-                            <h5>正品保障</h5>
-                            <p>正品保障,提供发票</p>
-                        </div>
-                    </li>
-                    <li>
-                        <i class="mod-service-icon mod_service_bao"></i>
-                        <div class="mod_service_tit">
-                            <h5>正品保障</h5>
-                            <p>正品保障,提供发票</p>
-                        </div>
-                    </li>
-                    <li>
-                        <i class="mod-service-icon mod_service_bao"></i>
-                        <div class="mod_service_tit">
-                            <h5>正品保障</h5>
-                            <p>正品保障,提供发票</p>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <div class="mod_help">
-                <dl class="mod_help_item">
-                    <dt>购物指南</dt>
-                    <dd> <a href="#">购物流程 </a></dd>
-                    <dd> <a href="#">会员介绍 </a></dd>
-                    <dd> <a href="#">生活旅行/团购 </a></dd>
-                    <dd> <a href="#">常见问题 </a></dd>
-                    <dd> <a href="#">大家电 </a></dd>
-                    <dd> <a href="#">联系客服 </a></dd>
-                </dl>
-                <dl class="mod_help_item">
-                    <dt>购物指南</dt>
-                    <dd> <a href="#">购物流程 </a></dd>
-                    <dd> <a href="#">会员介绍 </a></dd>
-                    <dd> <a href="#">生活旅行/团购 </a></dd>
-                    <dd> <a href="#">常见问题 </a></dd>
-                    <dd> <a href="#">大家电 </a></dd>
-                    <dd> <a href="#">联系客服 </a></dd>
-                </dl>
-                <dl class="mod_help_item">
-                    <dt>购物指南</dt>
-                    <dd> <a href="#">购物流程 </a></dd>
-                    <dd> <a href="#">会员介绍 </a></dd>
-                    <dd> <a href="#">生活旅行/团购 </a></dd>
-                    <dd> <a href="#">常见问题 </a></dd>
-                    <dd> <a href="#">大家电 </a></dd>
-                    <dd> <a href="#">联系客服 </a></dd>
-                </dl>
-                <dl class="mod_help_item">
-                    <dt>购物指南</dt>
-                    <dd> <a href="#">购物流程 </a></dd>
-                    <dd> <a href="#">会员介绍 </a></dd>
-                    <dd> <a href="#">生活旅行/团购 </a></dd>
-                    <dd> <a href="#">常见问题 </a></dd>
-                    <dd> <a href="#">大家电 </a></dd>
-                    <dd> <a href="#">联系客服 </a></dd>
-                </dl>
-                <dl class="mod_help_item">
-                    <dt>购物指南</dt>
-                    <dd> <a href="#">购物流程 </a></dd>
-                    <dd> <a href="#">会员介绍 </a></dd>
-                    <dd> <a href="#">生活旅行/团购 </a></dd>
-                    <dd> <a href="#">常见问题 </a></dd>
-                    <dd> <a href="#">大家电 </a></dd>
-                    <dd> <a href="#">联系客服 </a></dd>
-                </dl>
-                <dl class="mod_help_item mod_help_app">
-                    <dt>帮助中心</dt>
-                    <dd>
-                        <img src="upload/erweima.png" alt="">
-                        <p>品优购客户端</p>
-                    </dd>
-                </dl>
-            </div>
-
-            <div class="mod_copyright">
-                <p class="mod_copyright_links">
-                    关于我们 | 联系我们 | 联系客服 | 商家入驻 | 营销中心 | 手机品优购 | 友情链接 | 销售联盟 | 品优购社区 | 品优购公益 | English Site | Contact U
-                </p>
-                <p class="mod_copyright_info">
-                    地址:北京市昌平区建材城西路金燕龙办公楼一层 邮编:100096 电话:400-618-4000 传真:010-82935100 邮箱: zhanghj+itcast.cn <br> 京ICP备08001421号京公网安备110108007702
-                </p>
-            </div>
-        </div>
-    </div>
-
-    <button onclick="topFunction()" id="myBtn" style="bottom: -5em;">返回顶部</button>
-
-
-
-
-
-    <script>
-        var scrollBack = 0;
-
-        window.onscroll = function() {
-            document.body.scrollTop += scrollBack;
-            document.documentElement.scrollTop += scrollBack;
-            if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
-                document.getElementById("myBtn").style.bottom = null;
-            } else {
-                document.getElementById("myBtn").style.bottom = "-5em";;
-            }
-        }
-
-        window.onwheel = function() {
-            scrollBack = 0;
-        }
-        window.ontouchstart = window.onwheel;
-
-        function topFunction() {
-            scrollBack = -(document.body.scrollTop || document.documentElement.scrollTop) / (40);
-            document.body.scrollTop += scrollBack;
-            document.documentElement.scrollTop += scrollBack;
-        }
-    </script>
-
-
-</body>
-
-</html>

+ 755 - 3
src/main/webapp/index.jsp

@@ -1,5 +1,757 @@
-<html>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8">
+    <title>品优购-综合网购首选-正品低价、品质保障、配送及时、轻松购物!</title>
+    <meta name="description" content="品优购JD.COM-专业的综合网上购物商城,销售家电、数码通讯、电脑、家居百货、服装服饰、母婴、图书、食品等数万个品牌优质商品.便捷、诚信的服务,为您提供愉悦的网上购物体验!" />
+    <meta name="Keywords" content="网上购物,网上商城,手机,笔记本,电脑,MP3,CD,VCD,DV,相机,数码,配件,手表,存储卡,品优购" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="stylesheet" href="css/base.css">
+    <link rel="stylesheet" href="css/common.css">
+    <link rel="stylesheet" href="css/index.css">
+    <link rel="stylesheet" href="css/backTop.css">
+    <script src="js/jquery.min.js"></script>
+    <script src="js/index.js"></script>
+</head>
+
 <body>
-<h2>Hello World!</h2>
+    <div class="shortcut">
+        <div class="w">
+            <div class="fl">
+                <ul>
+                    <li>品优购欢迎您!</li>
+                    <li>
+                        <c:if test="${sessionScope.user == null}">
+                            <a href="login">请登录</a>&nbsp;<a href="register" class="style_red">免费注册</a>
+                        </c:if>
+                        <c:if test="${sessionScope.user != null}">
+                            <p>${sessionScope.user.email}</p>
+                        </c:if>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr">
+                <ul>
+                    <li><a href="#">我的订单</a></li>
+                    <li class="spacer"></li>
+                    <li>
+                        <a href="#">我的品优购</a>
+                        <i class="icomoon"></i>
+                    </li>
+                    <li class="spacer"></li>
+                    <li><a href="#">品优购会员</a></li>
+                    <li class="spacer"></li>
+                    <li><a href="#">企业采购</a></li>
+                    <li class="spacer"></li>
+                    <li><a href="#">关注品优购</a> <i class="icomoon"></i></li>
+                    <li class="spacer"></li>
+                    <li><a href="#">客户服务</a> <i class="icomoon"></i></li>
+                    <li class="spacer"></li>
+                    <li><a href="#">网站导航</a> <i class="icomoon"></i></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    
+    <div class="header w">
+        <div class="logo">
+            <h1>
+                <a href="index.html" title="品优购">品优购</a>
+            </h1>
+        </div>
+        <div class="search">
+            <input type="text" class="text" value="请搜索内容...">
+            <button class="btn">搜索</button>
+        </div>
+        <div class="hotwrods">
+            <a href="#" class="style-red">优惠购首发</a>
+            <a href="#">亿元优惠</a>
+            <a href="#">9.9元团购</a>
+            <a href="#">美满99减30</a>
+            <a href="#">办公用品</a>
+            <a href="#">电脑</a>
+            <a href="#">通信</a>
+        </div>
+        <div class="shopcar">
+            <i class="car"> </i> <i class="arrow">  </i>
+            <a href="../../gwc/gwc.html" title="我的购物车">我的购物车</a>
+            <i class="count">80</i>
+        </div>
+    </div>
+
+    <div class="nav">
+        <div class="w">
+            <div class="dropdown fl">
+                <div class="dt"> 品优购 </div>
+                <div class="dd">
+                    <ul>
+                        <li class="menu_item"><a href="a">所有商品</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="ten/list.html">十大人气商品排行</a><i>  </i></li>
+                        <li class="menu_item"><a href="ten/list.html">十大销售商品排行</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">家居、家具、家装、厨具</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">男装、女装、童装、内衣</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">个户化妆、清洁用品、宠物</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">鞋靴、箱包、珠宝、奢侈品</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">运动户外、钟表</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">汽车、汽车用品</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">母婴、玩具乐器</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">食品、酒类、生鲜、特产</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">医药保健</a> <i>  </i> </li>
+                        <li class="menu_item"><a href="#">图书、音像、电子书</a> <i> </i> </li>
+                        <li class="menu_item"><a href="#">彩票、旅行、充值、票务</a> <i> </i> </li>
+                        <li class="menu_item"><a href="#">理财、众筹、白条、保险</a> <i>  </i> </li>
+                    </ul>
+                </div>
+            </div>
+         
+            <div class="navitems fl">
+                <ul>
+                    <li><a href="#">服装城</a></li>
+                    <li><a href="#">美妆馆</a></li>
+                    <li><a href="#">传智超市</a></li>
+                    <li><a href="#">全球购</a></li>
+                    <li><a href="#">闪购</a></li>
+                    <li><a href="#">团购</a></li>
+                    <li><a href="#">拍卖</a></li>
+                    <li><a href="#">有趣</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+   
+    <div class="w">
+        <div class="main">
+            <div class="focus fl">
+                <a href="javascript:;" class="arrow-l">
+                    &lt;
+                 </a>
+                <a href="javascript:;" class="arrow-r">  </a>
+                <ul>
+                    <li>
+                        <a href="#"><img src="upload/focus.jpg" alt=""></a>
+                    </li>
+                    <li>
+                        <a href="#"><img src="upload/focus1.jpg" alt=""></a>
+                    </li>
+                    <li>
+                        <a href="#"><img src="upload/focus2.jpg" alt=""></a>
+                    </li>
+                    <li>
+                        <a href="#"><img src="upload/focus3.jpg" alt=""></a>
+                    </li>
+                </ul>
+                <ol class="circle">
+
+                </ol>
+            </div>
+            <div class="newsflash fr">
+                <div class="news">
+                    <div class="news-hd">
+                        品优购快报
+                        <a href="https://news.hao123.com/wangzhi">更多</a>
+                    </div>
+                    <div class="news-bd">
+                        <ul>
+                        <li><a href="#"><strong>[公告]</strong> 已上线苹果20,快来抢购。</a></li>
+                        <li><a href="#"><strong>[公告]</strong> 中国即将进口各国的蔬菜水果。</a></li>
+                        <li><a href="#"><strong>[公告]</strong> 互联网将在明年有大变动。</a></li>
+                        <li><a href="#"><strong>[公告]</strong> 北京大兴国际机场今日试飞。</a></li>
+                        <li><a href="#"><strong>[公告]</strong> 白宫以"不合作战略"应对国会调查。</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="lifeservice">
+                    <ul>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_huafei"></i>
+                                <p>话费</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                            <span class="hot"></span>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="service_ico service_ico_feiji"></i>
+                                <p>机票</p>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="bargain">
+                    <img src="upload/bargain.jpg" alt="">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="recommend w">
+        <div class="recom-hd fl">
+            <img src="img/clock.png" alt="">
+            <h3>今日推荐</h3>
+        </div>
+        <div class="recom-bd fl">
+            <ul>
+                <li>
+                    <a href="#">
+                        <img src="upload/pic.jpg" alt="">
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <img src="upload/pic.jpg" alt="">
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <img src="upload/pic.jpg" alt="">
+                    </a>
+                </li>
+                <li class="last">
+                    <a href="#">
+                        <img src="upload/pic.jpg" alt="">
+                    </a>
+                </li>
+
+            </ul>
+        </div>
+    </div>
+ 
+    <div class="floor">
+        <div class="jiadian w">
+            <div class="box-hd">
+                <h3>家用电器</h3>
+                <div class="tab-list">
+                    <ul>
+                        <li><a href="#" class="style-red">热门</a>|</li>
+                        <li><a href="#">大家电</a>|</li>
+                        <li><a href="#">生活电器</a>|</li>
+                        <li><a href="#">厨房电器</a>|</li>
+                        <li><a href="#">个护健康</a>|</li>
+                        <li><a href="#">应季电器</a>|</li>
+                        <li><a href="#">空气/净水</a>|</li>
+                        <li><a href="#">新奇特</a>|</li>
+                        <li><a href="#">高端电器</a></li>
+                    </ul>
+                </div>
+            </div>
+            <div class="box-bd">
+                <ul class="tab-con">
+                    <li class="w209">
+                        <ul class="tab-con-list">
+                            <li>
+                                <a href="#">节能补贴</a>
+                            </li>
+                            <li>
+                                <a href="#">4K电视</a>
+                            </li>
+                            <li>
+                                <a href="#">空气净化器</a>
+                            </li>
+                            <li>
+                                <a href="#">IH电饭煲</a>
+                            </li>
+                            <li>
+                                <a href="#">滚筒洗衣机</a>
+                            </li>
+                            <li>
+                                <a href="#">电热水器</a>
+                            </li>
+                        </ul>
+                        <img src="upload/floor-1-1.png" alt="">
+                    </li>
+                    <li class="w329">
+                        <img src="upload/pic1.jpg" alt="">
+                    </li>
+                    <li class="w219">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-2.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-3.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-4.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-5.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-6.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                </ul>
+               
+            </div>
+        </div>
+        <div class="shouji w">
+            <div class="box-hd">
+                <h3>手机通讯</h3>
+                <div class="tab-list">
+                    <ul>
+                        <li><a href="#" class="style-red">热门</a>|</li>
+                        <li><a href="#">大家电</a>|</li>
+                        <li><a href="#">生活电器</a>|</li>
+                        <li><a href="#">厨房电器</a>|</li>
+                        <li><a href="#">个护健康</a>|</li>
+                        <li><a href="#">应季电器</a>|</li>
+                        <li><a href="#">空气/净水</a>|</li>
+                        <li><a href="#">新奇特</a>|</li>
+                        <li><a href="#">高端电器</a></li>
+                    </ul>
+                </div>
+            </div>
+            <div class="box-bd">
+                <ul class="tab-con">
+                    <li class="w209">
+                        <ul class="tab-con-list">
+                            <li>
+                                <a href="#">节能补贴</a>
+                            </li>
+                            <li>
+                                <a href="#">4K电视</a>
+                            </li>
+                            <li>
+                                <a href="#">空气净化器</a>
+                            </li>
+                            <li>
+                                <a href="#">IH电饭煲</a>
+                            </li>
+                            <li>
+                                <a href="#">滚筒洗衣机</a>
+                            </li>
+                            <li>
+                                <a href="#">电热水器</a>
+                            </li>
+                        </ul>
+                        <img src="upload/floor-1-1.png" alt="">
+                    </li>
+                    <li class="w329">
+                        <img src="upload/pic1.jpg" alt="">
+                    </li>
+                    <li class="w219">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-2.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-3.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-4.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-5.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-6.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                </ul>
+
+            </div>
+        </div>
+        <div class="diannao w">
+            <div class="box-hd">
+                <h3>电脑办公</h3>
+                <div class="tab-list">
+                    <ul>
+                        <li><a href="#" class="style-red">热门</a>|</li>
+                        <li><a href="#">大家电</a>|</li>
+                        <li><a href="#">生活电器</a>|</li>
+                        <li><a href="#">厨房电器</a>|</li>
+                        <li><a href="#">个护健康</a>|</li>
+                        <li><a href="#">应季电器</a>|</li>
+                        <li><a href="#">空气/净水</a>|</li>
+                        <li><a href="#">新奇特</a>|</li>
+                        <li><a href="#">高端电器</a></li>
+                    </ul>
+                </div>
+            </div>
+            <div class="box-bd">
+                <ul class="tab-con">
+                    <li class="w209">
+                        <ul class="tab-con-list">
+                            <li>
+                                <a href="#">节能补贴</a>
+                            </li>
+                            <li>
+                                <a href="#">4K电视</a>
+                            </li>
+                            <li>
+                                <a href="#">空气净化器</a>
+                            </li>
+                            <li>
+                                <a href="#">IH电饭煲</a>
+                            </li>
+                            <li>
+                                <a href="#">滚筒洗衣机</a>
+                            </li>
+                            <li>
+                                <a href="#">电热水器</a>
+                            </li>
+                        </ul>
+                        <img src="upload/floor-1-1.png" alt="">
+                    </li>
+                    <li class="w329">
+                        <img src="upload/pic1.jpg" alt="">
+                    </li>
+                    <li class="w219">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-2.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-3.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-4.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-5.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-6.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                </ul>
+       
+            </div>
+        </div>
+        <div class="jiaju w">
+            <div class="box-hd">
+                <h3>精品家具</h3>
+                <div class="tab-list">
+                    <ul>
+                        <li><a href="#" class="style-red">热门</a>|</li>
+                        <li><a href="#">大家电</a>|</li>
+                        <li><a href="#">生活电器</a>|</li>
+                        <li><a href="#">厨房电器</a>|</li>
+                        <li><a href="#">个护健康</a>|</li>
+                        <li><a href="#">应季电器</a>|</li>
+                        <li><a href="#">空气/净水</a>|</li>
+                        <li><a href="#">新奇特</a>|</li>
+                        <li><a href="#">高端电器</a></li>
+                    </ul>
+                </div>
+            </div>
+            <div class="box-bd">
+                <ul class="tab-con">
+                    <li class="w209">
+                        <ul class="tab-con-list">
+                            <li>
+                                <a href="#">节能补贴</a>
+                            </li>
+                            <li>
+                                <a href="#">4K电视</a>
+                            </li>
+                            <li>
+                                <a href="#">空气净化器</a>
+                            </li>
+                            <li>
+                                <a href="#">IH电饭煲</a>
+                            </li>
+                            <li>
+                                <a href="#">滚筒洗衣机</a>
+                            </li>
+                            <li>
+                                <a href="#">电热水器</a>
+                            </li>
+                        </ul>
+                        <img src="upload/floor-1-1.png" alt="">
+                    </li>
+                    <li class="w329">
+                        <img src="upload/pic1.jpg" alt="">
+                    </li>
+                    <li class="w219">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-2.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-3.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-4.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                    <li class="w220">
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-5.png" alt="">
+                            </a>
+                        </div>
+                        <div class="tab-con-item">
+                            <a href="#">
+                                <img src="upload/floor-1-6.png" alt="">
+                            </a>
+                        </div>
+                    </li>
+                </ul>
+              
+            </div>
+        </div>
+    </div>
+
+    <div class="fixedtool">
+        <ul>
+            <li class="current">家用电器</li>
+            <li>手机通讯</li>
+            <li>电脑办公</li>
+            <li>精品家具</li>
+
+        </ul>
+    </div>
+    <div class="footer">
+        <div class="w">
+            <div class="mod_service">
+                <ul>
+                    <li>
+                        <i class="mod-service-icon mod_service_zheng"></i>
+                        <div class="mod_service_tit">
+                            <h5>正品保障</h5>
+                            <p>正品保障,提供发票</p>
+                        </div>
+                    </li>
+                    <li>
+                        <i class="mod-service-icon mod_service_kuai"></i>
+                        <div class="mod_service_tit">
+                            <h5>正品保障</h5>
+                            <p>正品保障,提供发票</p>
+                        </div>
+                    </li>
+                    <li>
+                        <i class="mod-service-icon mod_service_bao"></i>
+                        <div class="mod_service_tit">
+                            <h5>正品保障</h5>
+                            <p>正品保障,提供发票</p>
+                        </div>
+                    </li>
+                    <li>
+                        <i class="mod-service-icon mod_service_bao"></i>
+                        <div class="mod_service_tit">
+                            <h5>正品保障</h5>
+                            <p>正品保障,提供发票</p>
+                        </div>
+                    </li>
+                    <li>
+                        <i class="mod-service-icon mod_service_bao"></i>
+                        <div class="mod_service_tit">
+                            <h5>正品保障</h5>
+                            <p>正品保障,提供发票</p>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="mod_help">
+                <dl class="mod_help_item">
+                    <dt>购物指南</dt>
+                    <dd> <a href="#">购物流程 </a></dd>
+                    <dd> <a href="#">会员介绍 </a></dd>
+                    <dd> <a href="#">生活旅行/团购 </a></dd>
+                    <dd> <a href="#">常见问题 </a></dd>
+                    <dd> <a href="#">大家电 </a></dd>
+                    <dd> <a href="#">联系客服 </a></dd>
+                </dl>
+                <dl class="mod_help_item">
+                    <dt>购物指南</dt>
+                    <dd> <a href="#">购物流程 </a></dd>
+                    <dd> <a href="#">会员介绍 </a></dd>
+                    <dd> <a href="#">生活旅行/团购 </a></dd>
+                    <dd> <a href="#">常见问题 </a></dd>
+                    <dd> <a href="#">大家电 </a></dd>
+                    <dd> <a href="#">联系客服 </a></dd>
+                </dl>
+                <dl class="mod_help_item">
+                    <dt>购物指南</dt>
+                    <dd> <a href="#">购物流程 </a></dd>
+                    <dd> <a href="#">会员介绍 </a></dd>
+                    <dd> <a href="#">生活旅行/团购 </a></dd>
+                    <dd> <a href="#">常见问题 </a></dd>
+                    <dd> <a href="#">大家电 </a></dd>
+                    <dd> <a href="#">联系客服 </a></dd>
+                </dl>
+                <dl class="mod_help_item">
+                    <dt>购物指南</dt>
+                    <dd> <a href="#">购物流程 </a></dd>
+                    <dd> <a href="#">会员介绍 </a></dd>
+                    <dd> <a href="#">生活旅行/团购 </a></dd>
+                    <dd> <a href="#">常见问题 </a></dd>
+                    <dd> <a href="#">大家电 </a></dd>
+                    <dd> <a href="#">联系客服 </a></dd>
+                </dl>
+                <dl class="mod_help_item">
+                    <dt>购物指南</dt>
+                    <dd> <a href="#">购物流程 </a></dd>
+                    <dd> <a href="#">会员介绍 </a></dd>
+                    <dd> <a href="#">生活旅行/团购 </a></dd>
+                    <dd> <a href="#">常见问题 </a></dd>
+                    <dd> <a href="#">大家电 </a></dd>
+                    <dd> <a href="#">联系客服 </a></dd>
+                </dl>
+                <dl class="mod_help_item mod_help_app">
+                    <dt>帮助中心</dt>
+                    <dd>
+                        <img src="upload/erweima.png" alt="">
+                        <p>品优购客户端</p>
+                    </dd>
+                </dl>
+            </div>
+
+            <div class="mod_copyright">
+                <p class="mod_copyright_links">
+                    关于我们 | 联系我们 | 联系客服 | 商家入驻 | 营销中心 | 手机品优购 | 友情链接 | 销售联盟 | 品优购社区 | 品优购公益 | English Site | Contact U
+                </p>
+                <p class="mod_copyright_info">
+                    地址:北京市昌平区建材城西路金燕龙办公楼一层 邮编:100096 电话:400-618-4000 传真:010-82935100 邮箱: zhanghj+itcast.cn <br> 京ICP备08001421号京公网安备110108007702
+                </p>
+            </div>
+        </div>
+    </div>
+
+    <button onclick="topFunction()" id="myBtn" style="bottom: -5em;">返回顶部</button>
+
+
+
+
+
+    <script>
+        var scrollBack = 0;
+
+        window.onscroll = function() {
+            document.body.scrollTop += scrollBack;
+            document.documentElement.scrollTop += scrollBack;
+            if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
+                document.getElementById("myBtn").style.bottom = null;
+            } else {
+                document.getElementById("myBtn").style.bottom = "-5em";;
+            }
+        }
+
+        window.onwheel = function() {
+            scrollBack = 0;
+        }
+        window.ontouchstart = window.onwheel;
+
+        function topFunction() {
+            scrollBack = -(document.body.scrollTop || document.documentElement.scrollTop) / (40);
+            document.body.scrollTop += scrollBack;
+            document.documentElement.scrollTop += scrollBack;
+        }
+    </script>
+
+
 </body>
-</html>
+
+</html>

+ 4 - 1
src/main/webapp/loginPage.jsp

@@ -1,3 +1,6 @@
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
 <!DOCTYPE html>
 <html lang="en">
 
@@ -13,7 +16,7 @@
 <body>
     <div class="biggestBox">
         <!-- rember to set url!!!! -->
-        <form class="log-Page" method="post" action="loginPage.html">
+        <form class="log-Page" method="post" action="login">
             <h1>E&S</h1>
             <h1>登录</h1>
             <div class="keepOn">

+ 3 - 1
src/main/webapp/register.jsp

@@ -1,3 +1,5 @@
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <!DOCTYPE html>
 <html lang="en">
 
@@ -12,7 +14,7 @@
 
 <body>
     <div class="biggestBox">
-        <form class="reg-Page" method="post" action="register.html">
+        <form class="reg-Page" method="post" action="register">
 
             <div class="logo">E&S</div>
 

+ 21 - 1
src/main/webapp/ten/detail_1.html

@@ -13,6 +13,16 @@
     <script src="js/detail.js"></script>
 
 </head>
+<style>
+    .yourGoods {
+        position: absolute;
+        right: 0;
+        border: 1px solid red;
+        width: 200px;
+        height: 500px;
+        z-index: 999;
+    }
+</style>
 
 <body>
     <div class="shortcut">
@@ -50,15 +60,18 @@
     </div>
 
     <div class="header w">
+
         <div class="logo">
             <h1>
                 <a href="login/index.html" title="品优购">品优购</a>
             </h1>
         </div>
+
         <div class="search">
             <input type="search" name="" id="" placeholder="语言开发">
             <button>搜索</button>
         </div>
+
         <div class="hotwords">
             <a href="#" class="style_red">优惠购首发</a>
             <a href="#">亿元优惠</a>
@@ -69,11 +82,18 @@
             <a href="#">通信</a>
         </div>
 
+
         <div class="shopcar" type="button">
-            <i class="car"> </i>购物车<i class="arrow"></i>
+            <i class="car"> </i> <a href="../ShoppingCart.html">购物车</a> <i class="arrow"></i>
         </div>
+
+
+        <div class="yourGoods"></div>
+
     </div>
 
+
+
     <div class="nav">
         <div class="w">
             <div class="dropdown fl">

+ 14 - 14
src/test/java/test.java

@@ -18,18 +18,18 @@ public class test {
     }
     
     // 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);
-    }
+    // @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);
+    // }
 }

BIN
target/classes/WebsiteES/WebApp.class


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


+ 8 - 8
target/classes/generatorConfig.xml

@@ -33,35 +33,35 @@
         </javaClientGenerator>
 
         <table
-                tableName="userAccount"
+            tableName="userAccount"
         />
 
         <table
-                tableName="user_cart"
+            tableName="user_cart"
         />
 
         <table
-                tableName="user_collect"
+            tableName="user_collect"
         />
 
         <table
-                tableName="store"
+            tableName="store"
         />
 
         <table
-                tableName="goods"
+            tableName="goods"
         />
 
         <table
-                tableName="selection_group"
+            tableName="selection_group"
         />
 
         <table
-                tableName="selection"
+            tableName="selection"
         />
 
         <table
-                tableName="comment"
+            tableName="comment"
         />
     </context>
 </generatorConfiguration>

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

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

+ 8 - 8
target/classes/springmvc-config.xml

@@ -45,12 +45,12 @@
 
     <mvc:annotation-driven/>
     <mvc:default-servlet-handler/>
-       <mvc:interceptors>
-           <mvc:interceptor>
-               <mvc:mapping path="/*"/>
-               <mvc:exclude-mapping path="/logiin"/>
-               <mvc:exclude-mapping path="/regist"/>
-               <bean id="InterceptorLogin" class="WebsiteES.InterceptorLogin"/>
-           </mvc:interceptor>
-       </mvc:interceptors>
+    <!-- <mvc:interceptors>
+        <mvc:interceptor>
+            <mvc:mapping path="/*"/>
+            <mvc:exclude-mapping path="/login"/>
+            <mvc:exclude-mapping path="/regist"/>
+            <bean id="InterceptorLogin" class="WebsiteES.InterceptorLogin"/>
+        </mvc:interceptor>
+    </mvc:interceptors> -->
 </beans>

BIN
target/test-classes/test.class