diff --git a/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/web.xml b/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/web.xml index cfa0c40b..9dea6e97 100644 --- a/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/web.xml +++ b/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/web.xml @@ -52,18 +52,6 @@ / - - - zheng-upms-client diff --git a/zheng-cms/zheng-cms-job/src/main/resources/springMVC-servlet.xml b/zheng-cms/zheng-cms-job/src/main/resources/springMVC-servlet.xml index 8a3c464d..1aaa7fc3 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/springMVC-servlet.xml +++ b/zheng-cms/zheng-cms-job/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/resources/springMVC-servlet.xml b/zheng-cms/zheng-cms-search/src/main/resources/springMVC-servlet.xml index 8a3c464d..1aaa7fc3 100644 --- a/zheng-cms/zheng-cms-search/src/main/resources/springMVC-servlet.xml +++ b/zheng-cms/zheng-cms-search/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/index.jsp b/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/index.jsp index c88cefdc..9d0782a8 100644 --- a/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/index.jsp @@ -12,6 +12,6 @@ 首页 - +index \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/web.xml b/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/web.xml index c8d3abfc..39c0f968 100644 --- a/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/web.xml +++ b/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/web.xml @@ -52,18 +52,6 @@ / - - - DruidStatView diff --git a/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml b/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml index ca59a59c..1aaa7fc3 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml +++ b/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-pay/zheng-pay-admin/src/main/resources/springMVC-servlet.xml b/zheng-pay/zheng-pay-admin/src/main/resources/springMVC-servlet.xml index 8a3c464d..1aaa7fc3 100644 --- a/zheng-pay/zheng-pay-admin/src/main/resources/springMVC-servlet.xml +++ b/zheng-pay/zheng-pay-admin/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/index.jsp b/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/index.jsp index c88cefdc..9d0782a8 100644 --- a/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/index.jsp @@ -12,6 +12,6 @@ 首页 - +index \ No newline at end of file diff --git a/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/web.xml b/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/web.xml index c8d3abfc..39c0f968 100644 --- a/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/web.xml +++ b/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/web.xml @@ -52,18 +52,6 @@ / - - - DruidStatView diff --git a/zheng-pay/zheng-pay-web/src/main/resources/springMVC-servlet.xml b/zheng-pay/zheng-pay-web/src/main/resources/springMVC-servlet.xml index 8a3c464d..1aaa7fc3 100644 --- a/zheng-pay/zheng-pay-web/src/main/resources/springMVC-servlet.xml +++ b/zheng-pay/zheng-pay-web/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/index.jsp b/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/index.jsp index c88cefdc..9d0782a8 100644 --- a/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/index.jsp @@ -12,6 +12,6 @@ 首页 - +index \ No newline at end of file diff --git a/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/web.xml b/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/web.xml index c8d3abfc..39c0f968 100644 --- a/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/web.xml +++ b/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/web.xml @@ -52,18 +52,6 @@ / - - - DruidStatView diff --git a/zheng-ucenter/zheng-ucenter-home/src/main/resources/springMVC-servlet.xml b/zheng-ucenter/zheng-ucenter-home/src/main/resources/springMVC-servlet.xml index 8a3c464d..1aaa7fc3 100644 --- a/zheng-ucenter/zheng-ucenter-home/src/main/resources/springMVC-servlet.xml +++ b/zheng-ucenter/zheng-ucenter-home/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/index.jsp b/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/index.jsp index c88cefdc..9d0782a8 100644 --- a/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/index.jsp @@ -12,6 +12,6 @@ 首页 - +index \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/web.xml b/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/web.xml index c8d3abfc..39c0f968 100644 --- a/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/web.xml +++ b/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/web.xml @@ -52,18 +52,6 @@ / - - - DruidStatView diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/IndexController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/IndexController.java deleted file mode 100644 index b72d28e5..00000000 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/IndexController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.zheng.upms.admin.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 首页controller - * Created by ZhangShuzheng on 2017/01/19. - */ -@Controller -public class IndexController { - - /** - * 默认页跳转到后台 - * @return - */ - @RequestMapping(value = {"", "/index"}) - public String index() { - return "redirect:/manage"; - } - -} \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/ManageController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/ManageController.java index 2866c1c8..98ab19c2 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/ManageController.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/ManageController.java @@ -20,9 +20,4 @@ public class ManageController { return "/manage/index"; } - @RequestMapping("/login") - public String login() { - return "/manage/login"; - } - } \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-shiro.xml b/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-shiro.xml index 04416ea7..510ea549 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-shiro.xml +++ b/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-shiro.xml @@ -20,10 +20,11 @@ - swagger-ui.html = anon - /webjars/** = anon - /resources/** = anon - /sso/login = anon + + + + + /druid/**=authc /manage/**=authc diff --git a/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml b/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml index 8a3c464d..1aaa7fc3 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml +++ b/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/index.jsp index c88cefdc..beb37a57 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/index.jsp @@ -5,13 +5,4 @@ <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%> - - - - - 首页 - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/web.xml b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/web.xml index 9f5cec8f..516b2c8a 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/web.xml +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/web.xml @@ -52,18 +52,6 @@ / - - - zheng-upms-client @@ -90,6 +78,7 @@ + shiroFilter org.springframework.web.filter.DelegatingFilterProxy diff --git a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/resources/springMVC-servlet.xml b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/resources/springMVC-servlet.xml index 8a3c464d..1aaa7fc3 100644 --- a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/resources/springMVC-servlet.xml +++ b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/resources/springMVC-servlet.xml @@ -8,6 +8,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + + \ No newline at end of file diff --git a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/index.jsp b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/index.jsp index c88cefdc..9d0782a8 100644 --- a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/index.jsp @@ -12,6 +12,6 @@ 首页 - +index \ No newline at end of file diff --git a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/web.xml b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/web.xml index c8d3abfc..39c0f968 100644 --- a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/web.xml +++ b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/web.xml @@ -52,18 +52,6 @@ / - - - DruidStatView