diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java index fa2f9e0..e299bcb 100644 --- a/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/demo/src/main/java/com/example/demo/DemoApplication.java @@ -3,14 +3,23 @@ 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 +//@ServletComponentScan() +//@ComponentScan() //@MapperScan("com.example.demo.Dao") -public class DemoApplication { +public class DemoApplication extends SpringBootServletInitializer { 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/UserController.java b/demo/src/main/java/com/example/demo/loginService/UserController.java index 22ad6ec..27f1aa2 100644 --- a/demo/src/main/java/com/example/demo/loginService/UserController.java +++ b/demo/src/main/java/com/example/demo/loginService/UserController.java @@ -24,6 +24,7 @@ public class UserController extends HttpServlet { @GetMapping("/login") public String handle(HttpServletRequest request, HttpServletResponse response)throws IOException, ServletException { + //System.out.println("_______________"); String userName = request.getParameter("userName"); String userPwd = request.getParameter("userPwd"); User user = this.userServiceImpl.selectUserByuserName(userName); @@ -32,7 +33,7 @@ public class UserController extends HttpServlet { HttpSession session=request.getSession(); session.setAttribute("user",user); //request.getRequestDispatcher("index.html").forward(request,response); - return "index"; + return "/index"; } else{ return "/userPwdError"; @@ -43,18 +44,21 @@ public class UserController extends HttpServlet { //response.sendRedirect("notexit.jsp"); } } - @PostMapping("/login1") + + + @GetMapping("/login1") public String handle1(HttpServletRequest request,HttpServletResponse response){ String userName = request.getParameter("userName"); String userPwd = request.getParameter("userPwd"); String userPwd1=request.getParameter("userPwd1"); - User user=this.userServiceImpl.selectUserByuserName("userName"); + User user=new User(); + user = this.userServiceImpl.selectUserByuserName(userName); long count = 0; if(user!=null){ - return "/operateError"; + return "已有该用户名"; }else if(userPwd.equals(userPwd1)){ count = this.userServiceImpl.count()+1; - SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH-mm-ss"); + SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH-mm-ss"); String registerTime=dateFormat.format(new Date()); String userRight="0"; user = new User(); @@ -63,10 +67,11 @@ public class UserController extends HttpServlet { user.setUserPwd(userPwd); user.setRegisterTime(registerTime); user.setUserRight(userRight); + //System.out.println(user); this.userServiceImpl.insertUser(user); - return "/registerSuccess"; + return "注册成功"; }else{ - return "/userPwdNotSame"; + return "密码错误"; } } 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 edd6e8e..eaf6091 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 @@ -1,14 +1,11 @@ package com.example.demo.searchService.controller; +import com.alibaba.fastjson.JSONObject; import com.example.demo.bean.Product; import com.example.demo.searchService.service.ProductSearchService; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; 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; diff --git a/demo/src/main/resources/static/countCenter.html b/demo/src/main/resources/static/countCenter.html index 6b1c4fd..0722098 100644 --- a/demo/src/main/resources/static/countCenter.html +++ b/demo/src/main/resources/static/countCenter.html @@ -18,7 +18,7 @@
- +
diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html index 0aaa5a5..d88e6d1 100644 --- a/demo/src/main/resources/static/index.html +++ b/demo/src/main/resources/static/index.html @@ -38,7 +38,7 @@
- +
@@ -54,7 +54,7 @@

还款

- +
@@ -62,7 +62,7 @@

利息计算

- +
diff --git a/demo/src/main/resources/static/informationCenter.html b/demo/src/main/resources/static/informationCenter.html index 166c9e0..9a4de62 100644 --- a/demo/src/main/resources/static/informationCenter.html +++ b/demo/src/main/resources/static/informationCenter.html @@ -15,7 +15,7 @@
- +