shuzheng 9 лет назад
Родитель
Сommit
e01fbc2288
26 измененных файлов с 457 добавлено и 121 удалено
  1. 1 1
      zheng-oss/pom.xml
  2. 117 0
      zheng-oss/zheng-oss-admin/pom.xml
  3. 20 0
      zheng-oss/zheng-oss-admin/src/main/resources/applicationContext-dubbo-consumer.xml
  4. 9 0
      zheng-oss/zheng-oss-admin/src/main/resources/applicationContext-zhengAdmin.xml
  5. 3 0
      zheng-oss/zheng-oss-admin/src/main/resources/config.properties
  6. 4 0
      zheng-oss/zheng-oss-admin/src/main/resources/i18n/messages_en_US.properties
  7. 4 0
      zheng-oss/zheng-oss-admin/src/main/resources/i18n/messages_zh_CN.properties
  8. 30 0
      zheng-oss/zheng-oss-admin/src/main/resources/log4j.properties
  9. 3 0
      zheng-oss/zheng-oss-admin/src/main/resources/profiles/dev.properties
  10. 3 0
      zheng-oss/zheng-oss-admin/src/main/resources/profiles/pre.properties
  11. 3 0
      zheng-oss/zheng-oss-admin/src/main/resources/profiles/prod.properties
  12. 3 0
      zheng-oss/zheng-oss-admin/src/main/resources/profiles/test.properties
  13. 7 0
      zheng-oss/zheng-oss-admin/src/main/resources/redis.properties
  14. 22 0
      zheng-oss/zheng-oss-admin/src/main/resources/springMVC-servlet.xml
  15. 17 0
      zheng-oss/zheng-oss-admin/src/main/resources/zheng-upms-client.properties
  16. 21 0
      zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/403.jsp
  17. 17 0
      zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/404.jsp
  18. 43 0
      zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/500.jsp
  19. 25 0
      zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/error.jsp
  20. 8 0
      zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/index.jsp
  21. 97 0
      zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/web.xml
  22. 0 42
      zheng-oss/zheng-oss-sdk/pom.xml
  23. 0 55
      zheng-oss/zheng-oss-sdk/src/main/java/com/zheng/oss/sdk/QiniuDemo.java
  24. 0 8
      zheng-oss/zheng-oss-sdk/src/main/java/com/zheng/oss/sdk/service/OssService.java
  25. 0 8
      zheng-oss/zheng-oss-sdk/src/main/java/com/zheng/oss/sdk/service/QiniuService.java
  26. 0 7
      zheng-oss/zheng-oss-sdk/src/test/java/com/zheng/oss/sdk/AppTest.java

+ 1 - 1
zheng-oss/pom.xml

@@ -24,6 +24,6 @@
         <module>zheng-oss-rpc-api</module>
         <module>zheng-oss-rpc-service</module>
         <module>zheng-oss-web</module>
-        <module>zheng-oss-sdk</module>
+        <module>zheng-oss-admin</module>
     </modules>
 </project>

+ 117 - 0
zheng-oss/zheng-oss-admin/pom.xml

@@ -0,0 +1,117 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.zheng</groupId>
+        <artifactId>zheng-oss</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>zheng-oss-admin</artifactId>
+    <packaging>war</packaging>
+
+    <name>zheng-oss-admin Maven Webapp</name>
+    <url>http://www.zhangshuzheng.cn</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.zheng</groupId>
+            <artifactId>zheng-oss-rpc-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zheng</groupId>
+            <artifactId>zheng-admin</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <!-- zheng-upms-client -->
+        <dependency>
+            <groupId>com.zheng</groupId>
+            <artifactId>zheng-upms-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <env>dev</env>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <env>test</env>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <env>prod</env>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+        <finalName>zheng-oss-admin</finalName>
+        <filters>
+            <filter>src/main/resources/profiles/${env}.properties</filter>
+        </filters>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <!-- jetty插件 -->
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <!--<version>9.0.0.v20130308</version>-->
+                <version>9.2.7.v20150116</version>
+                <configuration>
+                    <scanIntervalSeconds>3</scanIntervalSeconds>
+                    <webApp>
+                        <contextPath>/</contextPath>
+                    </webApp>
+                    <httpConnector>
+                        <port>7772</port>
+                    </httpConnector>
+                    <reload>automatic</reload>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

+ 20 - 0
zheng-oss/zheng-oss-admin/src/main/resources/applicationContext-dubbo-consumer.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://code.alibabatech.com/schema/dubbo
+        http://code.alibabatech.com/schema/dubbo/dubbo.xsd ">
+
+    <dubbo:application name="zheng-oss-admin"/>
+
+    <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+
+    <!-- 订阅服务 -->
+    <dubbo:consumer check="false"/>
+
+    <!-- OSS -->
+    <dubbo:reference id="ossApiService" interface="com.zheng.oss.rpc.api.OssApiService" mock="true"/>
+
+</beans>

+ 9 - 0
zheng-oss/zheng-oss-admin/src/main/resources/applicationContext-zhengAdmin.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+	<!-- 启动解压zhengAdmin-x.x.x.jar到resources目录 -->
+	<bean id="zhengAdminUtil" class="com.zheng.common.util.ZhengAdminUtil"></bean>
+
+</beans>

+ 3 - 0
zheng-oss/zheng-oss-admin/src/main/resources/config.properties

@@ -0,0 +1,3 @@
+app.name=${app.name}
+env=${profile.env}
+zheng-admin.version=${zheng-admin.version}

+ 4 - 0
zheng-oss/zheng-oss-admin/src/main/resources/i18n/messages_en_US.properties

@@ -0,0 +1,4 @@
+403=Access forbidden!
+404=Page not found!
+500=Internal server error!
+error=Server error!

+ 4 - 0
zheng-oss/zheng-oss-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -0,0 +1,4 @@
+403=\u6CA1\u6709\u6743\u9650\uFF01
+404=\u9875\u9762\u6CA1\u6709\u627E\u5230\uFF01
+500=\u5185\u90E8\u670D\u52A1\u5668\u9519\u8BEF\uFF01
+error=\u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF\uFF01

+ 30 - 0
zheng-oss/zheng-oss-admin/src/main/resources/log4j.properties

@@ -0,0 +1,30 @@
+#off/fatal/error/warn/info/debug/all
+log4j.debug=false
+log4j.rootLogger=info,stdout,log,errorlog
+
+# Console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target = System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
+
+### Log ###
+log4j.appender.log = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.log.File = ../logs/zheng-oss-admin.log
+log4j.appender.log.Append = true
+log4j.appender.log.Threshold = DEBUG
+log4j.appender.log.DatePattern='.'yyyy-MM-dd
+log4j.appender.log.layout = org.apache.log4j.PatternLayout
+log4j.appender.log.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [ %p ] [ %C{1}.java :%L(%M)]  %m%n
+
+### Error ###
+log4j.appender.errorlog = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.errorlog.File = ../logs/zheng-oss-admin.error.log
+log4j.appender.errorlog.Append = true
+log4j.appender.errorlog.Threshold = ERROR
+log4j.appender.errorlog.DatePattern='.'yyyy-MM-dd
+log4j.appender.errorlog.layout = org.apache.log4j.PatternLayout
+log4j.appender.errorlog.layout.ConversionPattern =%-d{yyyy-MM-dd HH:mm:ss} [ %p ] [ %C{1}.java :%L(%M)] %m%n
+
+#Spring logging configuration
+log4j.category.org.springframework = warn

+ 3 - 0
zheng-oss/zheng-oss-admin/src/main/resources/profiles/dev.properties

@@ -0,0 +1,3 @@
+app.name=zheng-oss-admin
+profile.env=dev
+zheng-admin.version=1.0.0

+ 3 - 0
zheng-oss/zheng-oss-admin/src/main/resources/profiles/pre.properties

@@ -0,0 +1,3 @@
+app.name=zheng-oss-admin
+profile.env=pre
+zheng-admin.version=1.0.0

+ 3 - 0
zheng-oss/zheng-oss-admin/src/main/resources/profiles/prod.properties

@@ -0,0 +1,3 @@
+app.name=zheng-oss-admin
+profile.env=prod
+zheng-admin.version=1.0.0

+ 3 - 0
zheng-oss/zheng-oss-admin/src/main/resources/profiles/test.properties

@@ -0,0 +1,3 @@
+app.name=zheng-oss-admin
+profile.env=test
+zheng-admin.version=1.0.0

+ 7 - 0
zheng-oss/zheng-oss-admin/src/main/resources/redis.properties

@@ -0,0 +1,7 @@
+master.redis.ip=127.0.0.1
+master.redis.port=6379
+master.redis.password=FNFl9F2O2Skb8yoKM0jhHA==
+master.redis.max_active=500
+master.redis.max_idle=5
+master.redis.max_wait=10000
+master.redis.timeout=10000

+ 22 - 0
zheng-oss/zheng-oss-admin/src/main/resources/springMVC-servlet.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/mvc
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+    <!-- 根目录'/'对应页面 -->
+    <mvc:view-controller path="/" view-name="/index.jsp"/>
+
+    <!-- Jsp视图 -->
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="order" value="1"/>
+        <property name="prefix" value="/WEB-INF/jsp"/>
+        <property name="suffix" value=""/>
+        <property name="contentType" value="text/html; charset=utf-8"/>
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+    </bean>
+
+</beans>

+ 17 - 0
zheng-oss/zheng-oss-admin/src/main/resources/zheng-upms-client.properties

@@ -0,0 +1,17 @@
+# \u7EC8\u7AEF\u7C7B\u578B
+upms.type=client
+# \u7EC8\u7AEFsession\u540D\u79F0
+upms.session.id=zheng-upms-client-session-id
+# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740
+sso.server.url=http://upms.zhangshuzheng.cn:1111
+# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740
+upms.successUrl=/manage/index
+# \u672A\u6388\u6743\u5730\u5740
+upms.unauthorizedUrl=/403
+# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
+upms.session.timeout=1800000
+# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929
+upms.rememberMe.timeout=2592000
+# \u5B50\u7CFB\u7EDF
+appID=zheng-oss-admin
+appSecret=

+ 21 - 0
zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/403.jsp

@@ -0,0 +1,21 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ 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><spring:message code="403"/></title>
+</head>
+<body>
+<% Exception e = (Exception)request.getAttribute("ex"); %>
+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
+<hr />
+<h5>错误描述:</h5>
+<%= e.getMessage()%>
+</body>
+</html>

+ 17 - 0
zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/404.jsp

@@ -0,0 +1,17 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ 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><spring:message code="404"/></title>
+</head>
+<body>
+404
+</body>
+</html>

+ 43 - 0
zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/500.jsp

@@ -0,0 +1,43 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ 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><spring:message code="500"/></title>
+</head>
+<body>
+<center style="margin:50px auto">
+	<p>错误代码:500<%//=request.getAttribute("javax.servlet.error.status_code")%></p>
+	<p>您访问的页面有错误!</p>
+	<p>错误原因:${error.message}</p>
+	<p>错误内容:${error}</p>
+	<p><!--页面将在<span id="stime">5</span>秒后-->跳转到<a href="${pageContext.request.contextPath}/">首页</a>!</p>
+</center>
+<%
+/**
+监控出错人的IP
+String ip = request.getHeader(" x-forwarded-for");
+if (ip == null || ip.length() == 0 || " unknown".equalsIgnoreCase(ip)) {
+	ip = request.getHeader(" Proxy-Client-IP"); // 获取代理ip
+}
+if (ip == null || ip.length() == 0 || " unknown".equalsIgnoreCase(ip)) {
+	ip = request.getHeader(" WL-Proxy-Client-IP"); // 获取代理ip
+}
+if (ip == null || ip.length() == 0 || " unknown".equalsIgnoreCase(ip)) {
+	ip = request.getRemoteAddr(); // 获取真实ip
+}
+//out.println(ip+"<br/><br/>你的地址是:<br/><br/>");
+
+Document doc = Jsoup.connect("http://ip.chinaz.com/?IP="+ip).timeout(9000).get();
+Element e = doc.select("#status").first();
+//out.println(e);
+*/
+%>
+</body>
+</html>

+ 25 - 0
zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/error.jsp

@@ -0,0 +1,25 @@
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ 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><spring:message code="error"/></title>
+</head>
+<body>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
+<hr />
+<h5>错误描述:</h5>
+<%= e.getMessage()%>
+<h5>错误信息:</h5>
+<pre>
+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
+</pre>
+</body>
+</html>

+ 8 - 0
zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -0,0 +1,8 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ 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}"/>
+<c:redirect url="/manage/index"/>

+ 97 - 0
zheng-oss/zheng-oss-admin/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         version="2.5">
+
+    <!-- 强制进行转码 -->
+    <filter>
+        <filter-name>CharacterEncodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>CharacterEncodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+
+    <!-- 默认的spring配置文件是在WEB-INF下的applicationContext.xml -->
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+            classpath*:applicationContext*.xml
+        </param-value>
+    </context-param>
+
+    <!-- 日志配置文件 -->
+    <context-param>
+        <param-name>log4jConfigLocation</param-name>
+        <param-value>classpath:log4j.properties</param-value>
+    </context-param>
+
+    <!-- springMVC的核心控制器 -->
+    <servlet>
+        <servlet-name>springMVC</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath*:springMVC-servlet.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>springMVC</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+
+    <!-- shiroFilter -->
+    <filter>
+        <filter-name>shiroFilter</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+        <init-param>
+            <param-name>targetFilterLifecycle</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>shiroFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- session配置 -->
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+
+    <!-- 欢迎页面 -->
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+
+    <!-- 错误页面 -->
+    <error-page>
+        <error-code>403</error-code>
+        <location>/WEB-INF/jsp/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/WEB-INF/jsp/404.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>500</error-code>
+        <location>/WEB-INF/jsp/500.jsp</location>
+    </error-page>
+    <error-page>
+        <exception-type>java.lang.Throwable</exception-type>
+        <location>/WEB-INF/jsp/error.jsp</location>
+    </error-page>
+</web-app>

+ 0 - 42
zheng-oss/zheng-oss-sdk/pom.xml

@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.zheng</groupId>
-        <artifactId>zheng-oss</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <artifactId>zheng-oss-sdk</artifactId>
-    <packaging>jar</packaging>
-
-    <name>zheng-oss-sdk</name>
-    <url>http://www.zhangshuzheng.cn</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <!-- common包 -->
-        <dependency>
-            <groupId>com.zheng</groupId>
-            <artifactId>zheng-common</artifactId>
-            <version>1.0.0</version>
-            <type>jar</type>
-        </dependency>
-        <!-- 七牛云存储 -->
-        <dependency>
-            <groupId>com.qiniu</groupId>
-            <artifactId>qiniu-java-sdk</artifactId>
-            <version>[7.0.0, 7.1.99]</version>
-        </dependency>
-        <!-- 阿里云OSS -->
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-    </dependencies>
-</project>

+ 0 - 55
zheng-oss/zheng-oss-sdk/src/main/java/com/zheng/oss/sdk/QiniuDemo.java

@@ -1,55 +0,0 @@
-package com.zheng.oss.sdk;
-
-import com.qiniu.common.QiniuException;
-import com.qiniu.http.Response;
-import com.qiniu.storage.UploadManager;
-import com.qiniu.util.Auth;
-
-import java.io.IOException;
-
-/**
- * Created by shuzheng on 2016/11/12.
- */
-public class QiniuDemo {
-	//设置好账号的ACCESS_KEY和SECRET_KEY
-	String ACCESS_KEY = "";
-	String SECRET_KEY = "";
-	//要上传的空间
-	String bucketname = "zheng";
-	//上传到七牛后保存的文件名
-	String key = "my-java.png";
-	//上传文件的路径
-	String FilePath = "C:\\Users\\admin\\Pictures\\zsz\\20161108161228.png";
-
-	//密钥配置
-	Auth auth = Auth.create(ACCESS_KEY, SECRET_KEY);
-	//创建上传对象
-	UploadManager uploadManager = new UploadManager();
-
-	//简单上传,使用默认策略,只需要设置上传的空间名就可以了
-	public String getUpToken(){
-		return auth.uploadToken(bucketname);
-	}
-
-	public void upload() throws IOException {
-		try {
-			//调用put方法上传
-			Response res = uploadManager.put(FilePath, key, getUpToken());
-			//打印返回的信息
-			System.out.println(res.bodyString());
-		} catch (QiniuException e) {
-			Response r = e.response;
-			// 请求失败时打印的异常的信息
-			System.out.println(r.toString());
-			try {
-				//响应的文本信息
-				System.out.println(r.bodyString());
-			} catch (QiniuException e1) {
-				//ignore
-			}
-		}
-	}
-	public static void main(String[] args) throws IOException {
-		new QiniuDemo().upload();
-	}
-}

+ 0 - 8
zheng-oss/zheng-oss-sdk/src/main/java/com/zheng/oss/sdk/service/OssService.java

@@ -1,8 +0,0 @@
-package com.zheng.oss.sdk.service;
-
-/**
- * 阿里云OSS操作接口
- * Created by shuzheng on 2017/4/11.
- */
-public interface OssService {
-}

+ 0 - 8
zheng-oss/zheng-oss-sdk/src/main/java/com/zheng/oss/sdk/service/QiniuService.java

@@ -1,8 +0,0 @@
-package com.zheng.oss.sdk.service;
-
-/**
- * 七牛云存储操作接口
- * Created by shuzheng on 2017/4/11.
- */
-public interface QiniuService {
-}

+ 0 - 7
zheng-oss/zheng-oss-sdk/src/test/java/com/zheng/oss/sdk/AppTest.java

@@ -1,7 +0,0 @@
-package com.zheng.oss.sdk;
-
-/**
- * Created by shuzheng on 2016/11/12.
- */
-public class AppTest {
-}