Skip to content

Commit 48e021a

Browse files
committed
update
1 parent f2fd885 commit 48e021a

File tree

26 files changed

+71
-58
lines changed

26 files changed

+71
-58
lines changed

.idea/artifacts/book_war_exploded.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_09_EL_JSTL/_09_EL_JSTL.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
</content>
2929
<orderEntry type="inheritedJdk" />
3030
<orderEntry type="sourceFolder" forTests="false" />
31+
<orderEntry type="library" name="commons-fileupload-1.2.1" level="project" />
3132
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
3233
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.1" level="project" />
3334
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
3435
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.1" level="project" />
3536
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
3637
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.1" level="project" />
3738
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.1" level="project" />
38-
<orderEntry type="library" name="commons-fileupload-1.2.1" level="project" />
3939
</component>
4040
</module>

_16_json_ajax_i18n/_16_json_ajax_i18n.iml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
</content>
2929
<orderEntry type="inheritedJdk" />
3030
<orderEntry type="sourceFolder" forTests="false" />
31-
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
32-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.1" level="project" />
33-
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
34-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.1" level="project" />
35-
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
36-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.1" level="project" />
37-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.1" level="project" />
3831
<orderEntry type="library" name="gson-2.2.4" level="project" />
3932
<orderEntry type="library" name="hamcrest-core-1.3" level="project" />
4033
<orderEntry type="module-library">
@@ -47,5 +40,12 @@
4740
<SOURCES />
4841
</library>
4942
</orderEntry>
43+
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
44+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.1" level="project" />
45+
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
46+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.1" level="project" />
47+
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
48+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.1" level="project" />
49+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.1" level="project" />
5050
</component>
5151
</module>

book/book.iml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
</content>
2929
<orderEntry type="inheritedJdk" />
3030
<orderEntry type="sourceFolder" forTests="false" />
31-
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
32-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.1" level="project" />
33-
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
34-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.1" level="project" />
35-
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
36-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.1" level="project" />
37-
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.1" level="project" />
3831
<orderEntry type="library" name="book_lib" level="project" />
3932
<orderEntry type="library" name="book_lib (2)" level="project" />
4033
<orderEntry type="library" name="book_lib (3)" level="project" />
@@ -43,5 +36,12 @@
4336
<orderEntry type="library" name="lib" level="project" />
4437
<orderEntry type="library" name="lib)" level="project" />
4538
<orderEntry type="library" name="lib (2)" level="project" />
39+
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
40+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.1" level="project" />
41+
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
42+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.1" level="project" />
43+
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
44+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.1" level="project" />
45+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.1" level="project" />
4646
</component>
4747
</module>

book/src/main/java/com/atguigu/filter/ManagerFilter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.atguigu.filter;
22

3+
import com.alibaba.druid.filter.FilterChain;
4+
35
import javax.servlet.*;
46
import javax.servlet.http.HttpServlet;
57
import javax.servlet.http.HttpServletRequest;
@@ -12,7 +14,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
1214
}
1315

1416
@Override
15-
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
17+
public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain) throws IOException, ServletException {
1618
//将servletRequest 强制转换 成 HttpServletRequest类型
1719
HttpServletRequest httpServletRequest= (HttpServletRequest) request;
1820
//因为只有HttpServletRequest 才能 获取到 Session对象
@@ -27,6 +29,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
2729

2830

2931

32+
33+
3034
@Override
3135
public void destroy() {
3236
Filter.super.destroy();

book/src/main/webapp/pages/cart/cart.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<body>
4646

4747
<div id="header">
48-
<img class="logo_img" alt="" src="static/img/logo.gif" >
48+
<img class="logo_img" alt="" src="" >
4949
<span class="wel_word">购物车</span>
5050

5151
<%--静态包含 登录成功的菜单 --%>

book/src/main/webapp/pages/cart/checkout.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<body>
1616

1717
<div id="header">
18-
<img class="logo_img" alt="" src="../../static/img/logo.gif" >
18+
<img class="logo_img" alt="" src="" >
1919
<span class="wel_word">结算</span>
2020

2121
<%--静态包含 登录成功的菜单 --%>

book/src/main/webapp/pages/client/index.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<body>
3939

4040
<div id="header">
41-
<img class="logo_img" alt="" src="static/img/logo.gif" >
41+
<img class="logo_img" alt="" src="" >
4242
<span class="wel_word">网上书城</span>
4343
<div>
4444
<%-- 如果没登录,则显示登录注册按钮 --%>
@@ -48,7 +48,7 @@
4848
</c:if>
4949
<%-- 如果登录了,则不用显示登录注册按钮 --%>
5050
<c:if test="${not empty sessionScope.user}">
51-
<span>欢迎<span class="um_span">${sessionScope.user.username}</span>光临尚硅谷书城</span>
51+
<span>欢迎<span class="um_span">${sessionScope.user.username}</span>光临书城</span>
5252
<a href="orderServlet?action=showMyOrders">我的订单</a>
5353
<a href="userServlet?action=logout">注销</a>&nbsp;&nbsp;
5454
</c:if>

book/src/main/webapp/pages/common/footer.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
99
<div id="bottom">
1010
<span>
11-
尚硅谷书城.Copyright &copy;2015
11+
书城.Copyright &copy;2023
1212
</span>
1313
</div>

book/src/main/webapp/pages/common/login_success_menu.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
99
<div>
1010
<%-- user是由Session域里保存的,这个user是对象不是单属性,username是user的属性 --%>
11-
<span>欢迎<span class="um_span">${sessionScope.user.username}</span>光临尚硅谷书城</span>
11+
<span>欢迎<span class="um_span">${sessionScope.user.username}</span>光临书城</span>
1212
<a href="orderServlet?action=showMyOrders">我的订单</a>
1313
<a href="userServlet?action=logout">注销</a>&nbsp;&nbsp;
1414
<a href="index.jsp">返回</a>

0 commit comments

Comments
 (0)