From e2013f52db196702aa06ab1679e7471736d60247 Mon Sep 17 00:00:00 2001 From: jicunxi <1418230976@qq.com> Date: Mon, 14 Jan 2019 11:00:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loginService/API/impl/UserService.java | 2 +- .../API/impl/UserServiceImpl.java | 2 +- .../demo/loginService/SessionFilter.java | 106 +++++++++--------- .../demo/loginService/UserController.java | 2 +- .../main/resources/static/userPwdError.html | 2 +- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java b/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java index c1aca6c..7cc7345 100644 --- a/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java +++ b/demo/src/main/java/com/example/demo/loginService/API/impl/UserService.java @@ -7,6 +7,6 @@ import org.springframework.stereotype.Service; public abstract class UserService { public User selectUserByuserName(String userName){return null;} public User selectUserBytelephoneNum(String telephoneNum){return null;} - public void insertUser(long userNum, String userName, String userPwd, String registerTime, String userRight){} + public void addUser(User users){} public long count(){return 0;} } diff --git a/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java b/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java index 0f22007..9c61346 100644 --- a/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java +++ b/demo/src/main/java/com/example/demo/loginService/API/impl/UserServiceImpl.java @@ -21,7 +21,7 @@ public class UserServiceImpl extends UserService{ return this.UserMapper.selectUserBytelephoneNum(telephoneNum); } @Transactional(propagation=Propagation.REQUIRED,readOnly = false) - public void insertUser(User user){ + public void addUser(User user){ this.UserMapper.addUser(user); } @Transactional(propagation=Propagation.REQUIRED,readOnly = true) 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..af8977f 100644 --- a/demo/src/main/java/com/example/demo/loginService/SessionFilter.java +++ b/demo/src/main/java/com/example/demo/loginService/SessionFilter.java @@ -1,53 +1,53 @@ -package com.example.demo.loginService; - -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -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"}; - @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"); - } - return; - } - } - - - } - public boolean isNeedFilter(String uri) { - for (String includeUrl : includeUrls) { - if (includeUrl.equals(uri)) { - return false; - } - } - return true; - } - - -} +//package com.example.demo.loginService; +// +//import javax.servlet.*; +//import javax.servlet.annotation.WebFilter; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +//import javax.servlet.http.HttpSession; +//import java.io.IOException; +//@WebFilter(filterName = "sessionFilter",urlPatterns = {"/*"}) +//public class SessionFilter implements Filter { +// String NO_LOGIN="/Login.html"; +// String[] includeUrls=new String[]{"/Login.html","/Register.html"}; +// @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("/Login.html"); +// } +// return; +// } +// } +// +// +// } +// public boolean isNeedFilter(String uri) { +// for (String includeUrl : includeUrls) { +// if (includeUrl.equals(uri)) { +// return false; +// } +// } +// 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..b1640b0 100644 --- a/demo/src/main/java/com/example/demo/loginService/UserController.java +++ b/demo/src/main/java/com/example/demo/loginService/UserController.java @@ -69,7 +69,7 @@ public class UserController extends HttpServlet { user.setRegisterTime(registerTime); user.setUserRight(userRight); //System.out.println(user); - this.userServiceImpl.insertUser(user); + this.userServiceImpl.addUser(user); result = 1; }else{ result = 3; diff --git a/demo/src/main/resources/static/userPwdError.html b/demo/src/main/resources/static/userPwdError.html index d283643..f4d127c 100644 --- a/demo/src/main/resources/static/userPwdError.html +++ b/demo/src/main/resources/static/userPwdError.html @@ -3,7 +3,7 @@ Title - + From 2c7963e1bab0b1e55503c7ad20036e91fcac2c07 Mon Sep 17 00:00:00 2001 From: istars Date: Mon, 14 Jan 2019 16:23:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SearchServiceController.java | 18 +++++++++++------- demo/src/main/resources/static/allOrders.html | 1 - .../main/resources/static/js/productshow.js | 6 ++++-- demo/src/main/resources/static/search.html | 17 ++++++++++------- 4 files changed, 25 insertions(+), 17 deletions(-) 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..f8ba075 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 @@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -17,18 +19,20 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -@Controller +//@Controller +@RestController +@RequestMapping("/search") public class SearchServiceController extends HttpServlet { @Autowired private ProductSearchService productSearchService; - @RequestMapping("/search") - public void doPost(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException { + @RequestMapping(value = "/show",method = RequestMethod.POST) + public List search(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException { response.setContentType("text/html;charset=utf-8"); List list = new ArrayList(); String productName = request.getParameter("productName"); String category = request.getParameter("category"); - float intrate = Integer.parseInt(request.getParameter("intrate")); + float intrate = Float.parseFloat(request.getParameter("intrate")); if(productName!=null){ list = productSearchService.findByNameLike(productName); @@ -43,9 +47,9 @@ public class SearchServiceController extends HttpServlet { list = productSearchService.findByCount(); //默认按产品使用的产品的数量由高到低排序 } - String json = JSONObject.toJSONString(list); - response.getWriter().print(json); - +// String json = JSONObject.toJSONString(list); +// response.getWriter().print(json); + return list; } @PostMapping("/showIndex") diff --git a/demo/src/main/resources/static/allOrders.html b/demo/src/main/resources/static/allOrders.html index d14d2a4..33e4629 100644 --- a/demo/src/main/resources/static/allOrders.html +++ b/demo/src/main/resources/static/allOrders.html @@ -10,7 +10,6 @@ - diff --git a/demo/src/main/resources/static/js/productshow.js b/demo/src/main/resources/static/js/productshow.js index 491b244..bea9696 100644 --- a/demo/src/main/resources/static/js/productshow.js +++ b/demo/src/main/resources/static/js/productshow.js @@ -1,9 +1,11 @@ -window.onload(function requestData(){ +$(function(){ $.ajax({ url: "/search", type: "post", + data: {}, dataType: "json", success: function(data){ + console.log(data);//查看从后台传值内容 /*这个方法里是ajax发送请求成功之后执行的代码*/ showData(data);//我们仅做数据展示 }, @@ -19,7 +21,7 @@ function showData(data) { $("#content").html=null; for (var i = 0; i < data.length; i++) { var pro = data[i]; - var str = '
'+pro.productName+'

'+pro.productNum+'

'; + str = '
'+pro.productName+'

'+pro.productNum+'

'; $("#content").append(str); } diff --git a/demo/src/main/resources/static/search.html b/demo/src/main/resources/static/search.html index 245d7fb..eba380a 100644 --- a/demo/src/main/resources/static/search.html +++ b/demo/src/main/resources/static/search.html @@ -9,22 +9,25 @@ +
-

产品信息

-

内容简介

+

产品搜索

+
- - + + +
- + +
- - +
+ From ea83224f58d60aebf4b6a7a9533bcc14e5d41b91 Mon Sep 17 00:00:00 2001 From: istars Date: Mon, 14 Jan 2019 17:40:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/pom.xml | 6 +++++ .../com/example/demo/Dao/usageDateMapper.java | 2 +- .../controller/SearchServiceController.java | 22 +++++++++---------- .../impl/ProductSearchServiceImpl.java | 4 ++-- demo/src/main/resources/static/index.html | 4 ++-- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/demo/pom.xml b/demo/pom.xml index 3bc2f42..b65b330 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -103,6 +103,12 @@ tomcat-embed-jasper provided + + org.springframework.boot + spring-boot-starter-web + RELEASE + compile + diff --git a/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java b/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java index 7bc503e..1b8b02c 100644 --- a/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/usageDateMapper.java @@ -16,7 +16,7 @@ public interface usageDateMapper { @Select("select productNum from usageDate group by productNum order by count(productNum) DESC") - public List selectByCount(); + public List selectByCount(); @Insert("insert into usagedate(checkNum, productNum, userNum," + " bankAccount, bankNum, year, amount, startTime)" + 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 f8ba075..4d9fdef 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 @@ -22,7 +22,7 @@ import java.util.List; //@Controller @RestController @RequestMapping("/search") -public class SearchServiceController extends HttpServlet { +public class SearchServiceController{ @Autowired private ProductSearchService productSearchService; @@ -32,7 +32,7 @@ public class SearchServiceController extends HttpServlet { List list = new ArrayList(); String productName = request.getParameter("productName"); String category = request.getParameter("category"); - float intrate = Float.parseFloat(request.getParameter("intrate")); + //float intrate = Float.parseFloat(request.getParameter("intrate")); if(productName!=null){ list = productSearchService.findByNameLike(productName); @@ -40,24 +40,22 @@ public class SearchServiceController extends HttpServlet { }else if(category!=null){ list = productSearchService.findByCategory(category); //按产品类别搜索 - }else if(intrate!=0){ - list = productSearchService.findByIntrate(intrate); - //按利率排序由低到高 +// }else if(intrate!=0){ +// list = productSearchService.findByIntrate(intrate); +// //按利率排序由低到高 }else{ list = productSearchService.findByCount(); //默认按产品使用的产品的数量由高到低排序 } -// String json = JSONObject.toJSONString(list); -// response.getWriter().print(json); return list; } - @PostMapping("/showIndex") - public void showPro(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException{ + @RequestMapping(value = "/showIndex",method = RequestMethod.POST) + public List showPro(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException{ List products = productSearchService.findByCount(); - String json = JSONObject.toJSONString(products); - System.out.println(json); response.setCharacterEncoding("utf-8"); - response.getWriter().print(json); + return products; + //String json = JSONObject.toJSONString(list); + // response.getWriter().print(json); } } diff --git a/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java b/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java index 054c52f..ce1d895 100644 --- a/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java +++ b/demo/src/main/java/com/example/demo/searchService/service/impl/ProductSearchServiceImpl.java @@ -36,8 +36,8 @@ public class ProductSearchServiceImpl implements ProductSearchService { public List findByCount(){ Product product = new Product(); List productList = new ArrayList(); - List listusage = usageDateMapper.selectByCount(); - int[] arr = listusage.stream().mapToInt(Integer::valueOf).toArray(); + List listusage = usageDateMapper.selectByCount(); + long [] arr = listusage.stream().mapToLong(t->t.longValue()).toArray(); for(int i=0;i Date: Mon, 14 Jan 2019 21:59:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/DemoApplication.java | 13 +- .../demo/loginService/SessionFilter.java | 111 +++++++++--------- .../demo/loginService/UserController.java | 8 +- .../resources/static/RegisterSuccess.html | 2 +- 4 files changed, 65 insertions(+), 69 deletions(-) diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java index e299bcb..17fef60 100644 --- a/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/demo/src/main/java/com/example/demo/DemoApplication.java @@ -3,23 +3,14 @@ package com.example.demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -//@ServletComponentScan() -//@ComponentScan() +@ServletComponentScan("com.example.demo") //@MapperScan("com.example.demo.Dao") -public class DemoApplication extends SpringBootServletInitializer { +public class DemoApplication { public static void main(String[] args) { SpringApplication.run(DemoApplication.class, args); } -// @Override -// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { -// // 注意这里要指向原先用main方法执行的Application启动类 -// return builder.sources(Application.class); -// } - } 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 af8977f..3562877 100644 --- a/demo/src/main/java/com/example/demo/loginService/SessionFilter.java +++ b/demo/src/main/java/com/example/demo/loginService/SessionFilter.java @@ -1,53 +1,58 @@ -//package com.example.demo.loginService; -// -//import javax.servlet.*; -//import javax.servlet.annotation.WebFilter; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -//import javax.servlet.http.HttpSession; -//import java.io.IOException; -//@WebFilter(filterName = "sessionFilter",urlPatterns = {"/*"}) -//public class SessionFilter implements Filter { -// String NO_LOGIN="/Login.html"; -// String[] includeUrls=new String[]{"/Login.html","/Register.html"}; -// @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("/Login.html"); -// } -// return; -// } -// } -// -// -// } -// public boolean isNeedFilter(String uri) { -// for (String includeUrl : includeUrls) { -// if (includeUrl.equals(uri)) { -// return false; -// } -// } -// return true; -// } -// -// -//} +package com.example.demo.loginService; + +import com.example.demo.bean.User; + +import javax.servlet.*; +import javax.servlet.annotation.WebFilter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +@WebFilter(filterName = "sessionFilter",urlPatterns = {"/*"}) +public class SessionFilter implements Filter { + 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(true); + User user=(User)request.getSession().getAttribute("user"); + System.out.print(user); + String uri=request.getRequestURI(); + //是否需要过滤 + boolean needFilter=isNeedFilter(uri); + if(!needFilter){ + filterChain.doFilter(servletRequest,servletResponse); + }else{ + //需要过滤器 + //session中包含user对象，则是登录状态 + if(session!=null&&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"); + } + return; + } + } + + + + } + public boolean isNeedFilter(String uri) { + for (String includeUrl : includeUrls) { + if (includeUrl.equals(uri)) { + return false; + } + } + 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 b1640b0..25be64d 100644 --- a/demo/src/main/java/com/example/demo/loginService/UserController.java +++ b/demo/src/main/java/com/example/demo/loginService/UserController.java @@ -46,13 +46,14 @@ public class UserController extends HttpServlet { } + + @PostMapping("/register") public void handle1(HttpServletRequest request,HttpServletResponse response)throws IOException{ String userName = request.getParameter("userName"); String userPwd = request.getParameter("userPwd"); String userPwd1=request.getParameter("userPwd1"); - User user=new User(); - user = this.userServiceImpl.selectUserByuserName(userName); + User user = this.userServiceImpl.selectUserByuserName(userName); long count = 0; int result = 0; if(user!=null){ @@ -68,13 +69,12 @@ public class UserController extends HttpServlet { user.setUserPwd(userPwd); user.setRegisterTime(registerTime); user.setUserRight(userRight); - //System.out.println(user); this.userServiceImpl.addUser(user); result = 1; }else{ result = 3; } - if(result==1)response.sendRedirect("login.html"); + if(result==1)response.sendRedirect("RegisterSuccess.html"); else if(result==2)response.sendRedirect("userExisted.html"); else response.sendRedirect("userPwdNotSame.html"); } diff --git a/demo/src/main/resources/static/RegisterSuccess.html b/demo/src/main/resources/static/RegisterSuccess.html index b10d709..01c9754 100644 --- a/demo/src/main/resources/static/RegisterSuccess.html +++ b/demo/src/main/resources/static/RegisterSuccess.html @@ -6,6 +6,6 @@ - + \ No newline at end of file