Merge branch 'master' of http://39.108.133.138:3000/2001010134/RaoYing

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 数据源本地存储已忽略文件
+/dataSources/
+/dataSources.local.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/artifacts/raoyin_war.xml

@@ -0,0 +1,14 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="raoyin:war">
+    <output-path>$PROJECT_DIR$/target</output-path>
+    <properties id="maven-jee-properties">
+      <options>
+        <module>raoyin</module>
+        <packaging>war</packaging>
+      </options>
+    </properties>
+    <root id="archive" name="raoyin.war">
+      <element id="artifact" artifact-name="raoyin:war exploded" />
+    </root>
+  </artifact>
+</component>

.idea/artifacts/raoyin_war_exploded.xml

@@ -0,0 +1,23 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="raoyin:war exploded">
+    <output-path>$PROJECT_DIR$/target/raoyin</output-path>
+    <properties id="maven-jee-properties">
+      <options>
+        <exploded>true</exploded>
+        <module>raoyin</module>
+        <packaging>war</packaging>
+      </options>
+    </properties>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="raoyin" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/target/raoyin/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="raoyin/web/Web" />
+    </root>
+  </artifact>
+</component>

.idea/compiler.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="raoyin" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="raoyin" target="1.7" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/jarRepositories.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>

.idea/libraries/Maven__junit_junit_4_11.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.11/junit-4.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/raoyin.iml" filepath="$PROJECT_DIR$/raoyin.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

raoyin.iml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>

src/main/webapp/WEB-INF/jsp/shoppingShow.jsp

@@ -0,0 +1,244 @@
+<%--
+  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>