+
-
+
diff --git a/out/artifacts/hellossm_war2/hellossm_war.war b/out/artifacts/hellossm_war2/hellossm_war.war
new file mode 100644
index 0000000..48d6b02
Binary files /dev/null and b/out/artifacts/hellossm_war2/hellossm_war.war differ
diff --git a/src/main/java/cn/ppdxzz/controller/AdminController.java b/src/main/java/cn/ppdxzz/controller/AdminController.java
index 7c0de51..4dbfa27 100644
--- a/src/main/java/cn/ppdxzz/controller/AdminController.java
+++ b/src/main/java/cn/ppdxzz/controller/AdminController.java
@@ -218,7 +218,7 @@ public class AdminController {
writer.write("false");
return;
}
- if (admin.getPower() < 0 || admin.getPower() > 3) {
+ if (admin.getPower() < 0 || admin.getPower() > 4) {
writer.write("false");
return;
}
diff --git a/src/main/java/cn/ppdxzz/controller/VisitorController.java b/src/main/java/cn/ppdxzz/controller/VisitorController.java
index c07980f..196f73d 100644
--- a/src/main/java/cn/ppdxzz/controller/VisitorController.java
+++ b/src/main/java/cn/ppdxzz/controller/VisitorController.java
@@ -50,7 +50,7 @@ public class VisitorController {
* @return
* @throws Exception
*/
- @RequestMapping("/add")
+ @RequestMapping("/addLogin")
public ModelAndView addVisitor(Visitor visitor) throws Exception {
ModelAndView mv = new ModelAndView();
if (visitor == null || visitor.getName() == null || visitor.getSno() == null || visitor.getPhone() == null || visitor.getPlace() == null) {
@@ -80,13 +80,13 @@ public class VisitorController {
* @return
* @throws Exception
*/
- @RequestMapping("/logout")
+ @RequestMapping("/login_out")
public ModelAndView logout(HttpServletRequest request) throws Exception {
ModelAndView mv = new ModelAndView();
String id = request.getParameter("id");
if (id == null || "".trim().equals(id)) {
mv.addObject("logout_msg","系统繁忙,请稍后再试!");
- mv.setViewName("error_msg");
+ mv.setViewName("regist_visitor");
}
String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
visitorService.logout(id,date);
@@ -126,7 +126,7 @@ public class VisitorController {
* @throws Exception
*/
@RequestMapping("/findAll")
- public ModelAndView findAll(@RequestParam(name = "page",required = true,value = "1") int page, @RequestParam(name = "size",required = true,value = "4") int size,HttpServletRequest request,HttpServletResponse response) throws Exception {
+ public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "4") int size,HttpServletRequest request,HttpServletResponse response) throws Exception {
request.setCharacterEncoding("utf-8");
response.setCharacterEncoding("utf-8");
ModelAndView mv = new ModelAndView();
diff --git a/src/main/webapp/WEB-INF/jsp/admin-add.jsp b/src/main/webapp/WEB-INF/jsp/admin-add.jsp
index 20999e9..8c2e32a 100644
--- a/src/main/webapp/WEB-INF/jsp/admin-add.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin-add.jsp
@@ -1,3 +1,4 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%--
Created by IntelliJ IDEA.
User: user
@@ -45,9 +46,19 @@
diff --git a/src/main/webapp/WEB-INF/jsp/admin-edit.jsp b/src/main/webapp/WEB-INF/jsp/admin-edit.jsp
index 1f639fb..4435e93 100644
--- a/src/main/webapp/WEB-INF/jsp/admin-edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin-edit.jsp
@@ -105,7 +105,7 @@
var phone = $("#phone").val().trim();
var description = $("#description").val().trim();
layer.confirm('确定要修改吗',function (index) {
- if (${sessionScope.adminInfo.power < 2}) {//非管理员不能修改管理员信息
+ if (${sessionScope.adminInfo.power < 3}) {//非超级管理员不能修改管理员信息
layer.msg('对不起,您权限不足');
layer.close(index);
return false;
diff --git a/src/main/webapp/WEB-INF/jsp/admin-list.jsp b/src/main/webapp/WEB-INF/jsp/admin-list.jsp
index 0c1d906..58fb964 100644
--- a/src/main/webapp/WEB-INF/jsp/admin-list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin-list.jsp
@@ -106,7 +106,7 @@
-
+
@@ -184,9 +184,9 @@