From 0e0173229e36bd16716600f5fa90cb6895b57e99 Mon Sep 17 00:00:00 2001 From: jyx <1584081113@qq.com> Date: Mon, 14 Jan 2019 21:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4=E5=99=A8?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=88=90=E5=8A=9F=EF=BC=8C=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E6=88=90=E5=8A=9F=EF=BC=8C=E8=B0=83=E8=AF=95order?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/Dao/auditMapper.java | 2 +- .../com/example/demo/DemoApplication.java | 2 +- .../controller/messageController.java | 14 ++- .../{message.java => messageService.java} | 2 +- .../demo/loginService/SessionFilter.java | 110 +++++++++++++----- .../demo/loginService/UserController.java | 2 +- .../order/controller/orderController.java | 4 +- .../order/service/impl/orderServiceImpl.java | 4 +- .../demo/order/service/orderService.java | 2 +- .../controller/SearchServiceController.java | 2 + demo/src/main/resources/static/index.html | 9 +- .../resources/static/loanInformation.html | 2 +- demo/src/main/resources/static/myOrders.html | 2 +- 13 files changed, 104 insertions(+), 53 deletions(-) rename demo/src/main/java/com/example/demo/loanService/service/{message.java => messageService.java} (95%) diff --git a/demo/src/main/java/com/example/demo/Dao/auditMapper.java b/demo/src/main/java/com/example/demo/Dao/auditMapper.java index a8dec02..2cdf2ee 100644 --- a/demo/src/main/java/com/example/demo/Dao/auditMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/auditMapper.java @@ -11,7 +11,7 @@ public interface auditMapper { public Audit selectAudioByCheckNum(long checkNum); @Select("select * from audit where userNum = #{userNum}") - public List selectAudioByUserNum(long userNum); + public List selectAuditByUserNum(long userNum); @Select("select * from audit") public List select(); diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java index e299bcb..083ce0f 100644 --- a/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/demo/src/main/java/com/example/demo/DemoApplication.java @@ -7,7 +7,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -//@ServletComponentScan() +@ServletComponentScan() //@ComponentScan() //@MapperScan("com.example.demo.Dao") public class DemoApplication extends SpringBootServletInitializer { diff --git a/demo/src/main/java/com/example/demo/loanService/controller/messageController.java b/demo/src/main/java/com/example/demo/loanService/controller/messageController.java index 9fbfbcb..02e6017 100644 --- a/demo/src/main/java/com/example/demo/loanService/controller/messageController.java +++ b/demo/src/main/java/com/example/demo/loanService/controller/messageController.java @@ -4,26 +4,28 @@ package com.example.demo.loanService.controller; import com.example.demo.Dao.auditMapper; import com.example.demo.bean.Audit; import com.example.demo.bean.User; -import com.example.demo.loanService.service.message; +import com.example.demo.loanService.service.messageService; import com.example.demo.util.nowTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import java.io.IOException; @Controller public class messageController extends HttpServlet { @Autowired auditMapper auditMapper; private nowTime nowTime=new nowTime(); - private message message=new message(); + private messageService message=new messageService(); - @RequestMapping("/借款/index.html")//填写贷款基本信息的界面 - public String doPost(HttpServletResponse response, HttpServletRequest request){ + @RequestMapping(value = "/loan",method = RequestMethod.POST)//填写贷款基本信息的界面 + public void doPost(HttpServletResponse response, HttpServletRequest request)throws IOException { HttpSession session=request.getSession(); User user=new User(); user=(User)session.getAttribute("user"); @@ -35,9 +37,9 @@ public class messageController extends HttpServlet { audit.setBankAccount(request.getParameter("bankAccount")); audit.setEquation(Integer.parseInt(request.getParameter("equation"))); audit.setApplyTime(nowTime.nowTime()); - audit.setUserNum(Long.parseLong("d")); + //audit.setUserNum(num); message.message(audit); - return "";//审核界面 + response.sendRedirect("waitAuditing.html"); } } diff --git a/demo/src/main/java/com/example/demo/loanService/service/message.java b/demo/src/main/java/com/example/demo/loanService/service/messageService.java similarity index 95% rename from demo/src/main/java/com/example/demo/loanService/service/message.java rename to demo/src/main/java/com/example/demo/loanService/service/messageService.java index d0b9974..f640394 100644 --- a/demo/src/main/java/com/example/demo/loanService/service/message.java +++ b/demo/src/main/java/com/example/demo/loanService/service/messageService.java @@ -4,7 +4,7 @@ import com.example.demo.Dao.auditMapper; import com.example.demo.bean.Audit; import org.springframework.beans.factory.annotation.Autowired; -public class message { +public class messageService { @Autowired auditMapper auditMapper; diff --git a/demo/src/main/java/com/example/demo/loginService/SessionFilter.java b/demo/src/main/java/com/example/demo/loginService/SessionFilter.java index 23011fb..af02b22 100644 --- a/demo/src/main/java/com/example/demo/loginService/SessionFilter.java +++ b/demo/src/main/java/com/example/demo/loginService/SessionFilter.java @@ -1,5 +1,8 @@ package com.example.demo.loginService; +import com.example.demo.bean.User; + +import javax.jws.soap.SOAPBinding; import javax.servlet.*; import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; @@ -8,45 +11,88 @@ import javax.servlet.http.HttpSession; import java.io.IOException; @WebFilter(filterName = "sessionFilter",urlPatterns = {"/*"}) public class SessionFilter implements Filter { - String NO_LOGIN="/notLogin"; - String[] includeUrls=new String[]{"redirect:http://localhost:8080/firstproject/demo/Front-end/Login/Login.html","redirect:http://localhost:8080/firstproject/demo/Front-end/Login/Login1.html"}; + String NO_LOGIN="/Login.html"; + String[] includeUrls=new String[]{"/Login.html","/Register.html","/login","/register"}; +// @Override +// public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException,IOException{ +// HttpServletRequest request=(HttpServletRequest) servletRequest; +// HttpServletResponse response=(HttpServletResponse) servletResponse; +// HttpSession session=request.getSession(); +// String uri=request.getRequestURI(); +// System.out.println(uri); +// //是否需要过滤 +// boolean needFilter=isNeedFilter(uri); +// if(!needFilter){ +// //filterChain.doFilter(servletRequest,servletResponse); +// filterChain.doFilter(request,response); +// }else{ +// //需要过滤器 +// //session中包含user对象，则是登录状态 +// User user = (User)session.getAttribute("user"); +// if(session!=null&&session.getAttribute("user")!=null){ +// filterChain.doFilter(servletRequest,servletResponse); +// }else{ +// String requestType=request.getHeader("X-Requested-with"); +// //判断是否是ajax请求 +// if(requestType!=null&&"XMLHttpRequest".equals(requestType)){ +// response.sendRedirect(NO_LOGIN); +// }else{ +// //重定向到登录页(需要在static文件夹下建立此html文件) +// response.sendRedirect("/Login.html"); +// } +// } +// } +// } +// +// public boolean isNeedFilter(String uri) { +// for (String includeUrl : includeUrls) { +// if (includeUrl.equals(uri)) { +// return false; +// } +// } +// return true; +// } + @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException,IOException{ - HttpServletRequest request=(HttpServletRequest) servletRequest; - HttpServletResponse response=(HttpServletResponse) servletResponse; - HttpSession session=request.getSession(false); - String uri=request.getRequestURI(); - //是否需要过滤 - boolean needFilter=isNeedFilter(uri); - if(!needFilter){ - filterChain.doFilter(servletRequest,servletResponse); - }else{ - //需要过滤器 - //session中包含user对象，则是登录状态 - if(session!=null&&session.getAttribute("user")!=null){ - filterChain.doFilter(servletRequest,servletResponse); - }else{ - String requestType=request.getHeader("X-Requested-with"); - //判断是否是ajax请求 - if(requestType!=null&&"XMLHttpRequest".equals(requestType)){ - response.sendRedirect(NO_LOGIN); - }else{ - //重定向到登录页(需要在static文件夹下建立此html文件) - response.sendRedirect(request.getContextPath()+"redirect:http://localhost:8080/firstproject/demo/Front-end/Login/Login.html"); - } + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + // 获得在下面代码中要用的request,response,session对象 + HttpServletRequest servletRequest = (HttpServletRequest) request; + HttpServletResponse servletResponse = (HttpServletResponse) response; + HttpSession session = servletRequest.getSession(); + + // 获得用户请求的URI + String path = servletRequest.getRequestURI(); + System.out.println(path); + + // 从session里用户 + User user = (User)session.getAttribute("user"); + + //创建类Constants.java，里面写的是无需过滤的页面 + for (int i = 0; i < includeUrls.length; i++) { + + if (path.indexOf(includeUrls[i]) > -1) { + chain.doFilter(servletRequest, servletResponse); return; } } + // 登陆页面无需过滤 +// if(path.indexOf("/Login,html") > -1) { +// chain.doFilter(servletRequest, servletResponse); +// return; +// } +// - } - public boolean isNeedFilter(String uri) { - for (String includeUrl : includeUrls) { - if (includeUrl.equals(uri)) { - return false; - } + // 判断如果没有取到用户信息,就跳转到登陆页面 + if (user == null) { + // 跳转到登陆页面 + servletResponse.sendRedirect("/Login.html"); + } else { + // 已经登陆,继续此次请求 + chain.doFilter(request, response); } - return true; + } diff --git a/demo/src/main/java/com/example/demo/loginService/UserController.java b/demo/src/main/java/com/example/demo/loginService/UserController.java index 632243f..5c9aa30 100644 --- a/demo/src/main/java/com/example/demo/loginService/UserController.java +++ b/demo/src/main/java/com/example/demo/loginService/UserController.java @@ -74,7 +74,7 @@ public class UserController extends HttpServlet { }else{ result = 3; } - if(result==1)response.sendRedirect("login.html"); + if(result==1)response.sendRedirect("Register.html"); else if(result==2)response.sendRedirect("userExisted.html"); else response.sendRedirect("userPwdNotSame.html"); } diff --git a/demo/src/main/java/com/example/demo/order/controller/orderController.java b/demo/src/main/java/com/example/demo/order/controller/orderController.java index dcb0692..e3a0844 100644 --- a/demo/src/main/java/com/example/demo/order/controller/orderController.java +++ b/demo/src/main/java/com/example/demo/order/controller/orderController.java @@ -23,13 +23,13 @@ public class orderController extends HttpServlet { @RequestMapping("/orderlist") public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=utf-8"); - List list = new ArrayList(); HttpSession session = request.getSession(); User user = new User(); user = (User) session.getAttribute("user"); long userNum = user.getUserNum(); - list = orderService.selectAudioByUserNum(userNum); + List list = orderService.selectAuditByUserNum(userNum); String json = JSONObject.toJSONString(list); + System.out.println(json); response.getWriter().print(json); } } diff --git a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java index 349673d..c737939 100644 --- a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java +++ b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java @@ -10,7 +10,7 @@ import java.util.List; public class orderServiceImpl implements orderService { @Autowired public auditMapper auditMapper; - public List selectAudioByUserNum(long userNum){ - return auditMapper.selectAudioByUserNum(userNum); + public List selectAuditByUserNum(long userNum){ + return auditMapper.selectAuditByUserNum(userNum); } } diff --git a/demo/src/main/java/com/example/demo/order/service/orderService.java b/demo/src/main/java/com/example/demo/order/service/orderService.java index 6210e92..924e398 100644 --- a/demo/src/main/java/com/example/demo/order/service/orderService.java +++ b/demo/src/main/java/com/example/demo/order/service/orderService.java @@ -5,5 +5,5 @@ import com.example.demo.bean.Audit; import java.util.List; public interface orderService { - public List selectAudioByUserNum(long userNum); + public List selectAuditByUserNum(long userNum); } diff --git a/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java b/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java index eaf6091..91fe23d 100644 --- a/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java +++ b/demo/src/main/java/com/example/demo/searchService/controller/SearchServiceController.java @@ -6,6 +6,7 @@ import com.example.demo.bean.Product; import com.example.demo.searchService.service.ProductSearchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,6 +52,7 @@ public class SearchServiceController extends HttpServlet { @PostMapping("/showIndex") public void showPro(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException{ List products = productSearchService.findByCount(); + System.out.println(products); String json = JSONObject.toJSONString(products); System.out.println(json); response.setCharacterEncoding("utf-8"); diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html index d88e6d1..ecacebb 100644 --- a/demo/src/main/resources/static/index.html +++ b/demo/src/main/resources/static/index.html @@ -33,7 +33,7 @@

3分钟申请，5秒审批

- +
@@ -77,12 +77,12 @@
- +
- +
@@ -193,6 +193,7 @@ }); }); + //展示数据 function showData(data) { var str = "";//定义用于拼接的字符串 @@ -200,7 +201,7 @@ str= "
\n" + "
\n" + - "

"+data[i].productNum+""

\n" + + "

"+data[i].productNum+"

\n" + "
\n" + "
\n" + " \n" + diff --git a/demo/src/main/resources/static/loanInformation.html b/demo/src/main/resources/static/loanInformation.html index 949c6f8..a911f2d 100644 --- a/demo/src/main/resources/static/loanInformation.html +++ b/demo/src/main/resources/static/loanInformation.html @@ -224,7 +224,7 @@ box-shadow:inset 0px 1px 1px rgba(0,0,0,0.5);*/ -
+
贷款金额 diff --git a/demo/src/main/resources/static/myOrders.html b/demo/src/main/resources/static/myOrders.html index cdfe8f1..731b4a4 100644 --- a/demo/src/main/resources/static/myOrders.html +++ b/demo/src/main/resources/static/myOrders.html @@ -23,7 +23,7 @@
我的订单
- + 刷新