Ver Fonte

统一各webapp默认首页

shuzheng há 9 anos atrás
pai
commit
5ac87a0066
24 ficheiros alterados com 28 adições e 140 exclusões
  1. 0 12
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/web.xml
  2. 2 1
      zheng-cms/zheng-cms-job/src/main/resources/springMVC-servlet.xml
  3. 2 1
      zheng-cms/zheng-cms-search/src/main/resources/springMVC-servlet.xml
  4. 1 1
      zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/index.jsp
  5. 0 12
      zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/web.xml
  6. 2 1
      zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml
  7. 2 1
      zheng-pay/zheng-pay-admin/src/main/resources/springMVC-servlet.xml
  8. 1 1
      zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/index.jsp
  9. 0 12
      zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/web.xml
  10. 2 1
      zheng-pay/zheng-pay-web/src/main/resources/springMVC-servlet.xml
  11. 1 1
      zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/index.jsp
  12. 0 12
      zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/web.xml
  13. 2 1
      zheng-ucenter/zheng-ucenter-home/src/main/resources/springMVC-servlet.xml
  14. 1 1
      zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/index.jsp
  15. 0 12
      zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/web.xml
  16. 0 24
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/IndexController.java
  17. 0 5
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/ManageController.java
  18. 5 4
      zheng-upms/zheng-upms-server/src/main/resources/applicationContext-shiro.xml
  19. 2 1
      zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml
  20. 1 10
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/index.jsp
  21. 1 12
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/web.xml
  22. 2 1
      zheng-wechat-mp/zheng-wechat-mp-admin/src/main/resources/springMVC-servlet.xml
  23. 1 1
      zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/index.jsp
  24. 0 12
      zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/web.xml

+ 0 - 12
zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/web.xml

@@ -52,18 +52,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- Spring Security -->
-    <!--
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    -->
-
     <!-- zhang-upms-client -->
     <filter>
         <filter-name>zheng-upms-client</filter-name>

+ 2 - 1
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">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 2 - 1
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">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 1 - 1
zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -12,6 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-
+index
 </body>
 </html>

+ 0 - 12
zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/web.xml

@@ -52,18 +52,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- Spring Security -->
-    <!--
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    -->
-
     <!-- Druid连接池监控页面 -->
     <servlet>
         <servlet-name>DruidStatView</servlet-name>

+ 2 - 1
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">
 
-
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 2 - 1
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">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 1 - 1
zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -12,6 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-
+index
 </body>
 </html>

+ 0 - 12
zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/web.xml

@@ -52,18 +52,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- Spring Security -->
-    <!--
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    -->
-
     <!-- Druid连接池监控页面 -->
     <servlet>
         <servlet-name>DruidStatView</servlet-name>

+ 2 - 1
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">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 1 - 1
zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -12,6 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-
+index
 </body>
 </html>

+ 0 - 12
zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/web.xml

@@ -52,18 +52,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- Spring Security -->
-    <!--
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    -->
-
     <!-- Druid连接池监控页面 -->
     <servlet>
         <servlet-name>DruidStatView</servlet-name>

+ 2 - 1
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">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 1 - 1
zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -12,6 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-
+index
 </body>
 </html>

+ 0 - 12
zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/web.xml

@@ -52,18 +52,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- Spring Security -->
-    <!--
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    -->
-
     <!-- Druid连接池监控页面 -->
     <servlet>
         <servlet-name>DruidStatView</servlet-name>

+ 0 - 24
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/IndexController.java

@@ -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";
-	}
-
-}

+ 0 - 5
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";
-	}
-
 }

+ 5 - 4
zheng-upms/zheng-upms-server/src/main/resources/applicationContext-shiro.xml

@@ -20,10 +20,11 @@
         <property name="unauthorizedUrl" value="/403"/>
         <property name="filterChainDefinitions">
             <value>
-                swagger-ui.html = anon
-                /webjars/** = anon
-                /resources/** = anon
-                /sso/login = anon
+                <!--/swagger-ui.html = anon-->
+                <!--/webjars/** = anon-->
+                <!--/resources/** = anon-->
+                <!--/sso/login = anon-->
+                /druid/**=authc
                 /manage/**=authc
             </value>
         </property>

+ 2 - 1
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">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 1 - 10
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"%>
 <c:set var="basePath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8"/>
-    <title>首页</title>
-</head>
-<body>
-
-</body>
-</html>
+<c:redirect url="/manage"/>

+ 1 - 12
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/web.xml

@@ -52,18 +52,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- Spring Security -->
-    <!--
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    -->
-
     <!-- zhang-upms-client -->
     <filter>
         <filter-name>zheng-upms-client</filter-name>
@@ -90,6 +78,7 @@
     </filter-mapping>
 
     <!-- shiro -->
+    <!-- DelegatingFilterProxy作用是自动到spring容器查找名字为shiroFilter(filter-name)的bean并把所有Filter的操作委托给它。然后将shiroFilter配置到spring容器即可 -->
     <filter>
         <filter-name>shiroFilter</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>

+ 2 - 1
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">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
 
 </beans>

+ 1 - 1
zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -12,6 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-
+index
 </body>
 </html>

+ 0 - 12
zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/web.xml

@@ -52,18 +52,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- Spring Security -->
-    <!--
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    -->
-
     <!-- Druid连接池监控页面 -->
     <servlet>
         <servlet-name>DruidStatView</servlet-name>