rename

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationHandleBeforeEvent.java

@@ -4,7 +4,7 @@ import org.hswebframework.web.authorization.define.AuthorizingContext;
 import org.hswebframework.web.authorization.define.HandleType;
 import org.springframework.context.ApplicationEvent;
 
-public class AuthorizationHandleBeforeEvent extends ApplicationEvent implements AuthorizationEvent {
+public class AuthorizingHandleBeforeEvent extends ApplicationEvent implements AuthorizationEvent {
 
     private static final long serialVersionUID = -1095765748533721998L;
 
@@ -16,7 +16,7 @@ public class AuthorizationHandleBeforeEvent extends ApplicationEvent implements
 
     private HandleType handleType;
 
-    public AuthorizationHandleBeforeEvent(AuthorizingContext context, HandleType handleType) {
+    public AuthorizingHandleBeforeEvent(AuthorizingContext context, HandleType handleType) {
         super(context);
         this.handleType = handleType;
     }

hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java

@@ -13,7 +13,7 @@ import org.hswebframework.web.authorization.define.AuthorizeDefinition;
 import org.hswebframework.web.authorization.define.AuthorizingContext;
 import org.hswebframework.web.authorization.define.HandleType;
 import org.hswebframework.web.authorization.exception.AccessDenyException;
-import org.hswebframework.web.authorization.listener.event.AuthorizationHandleBeforeEvent;
+import org.hswebframework.web.authorization.listener.event.AuthorizingHandleBeforeEvent;
 import org.hswebframework.web.boost.aop.context.MethodInterceptorContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@ public class DefaultAuthorizingHandler implements AuthorizingHandler {
     }
     private boolean handleEvent(AuthorizingContext context,HandleType type){
         if(null!=eventPublisher) {
-            AuthorizationHandleBeforeEvent event = new AuthorizationHandleBeforeEvent(context, type);
+            AuthorizingHandleBeforeEvent event = new AuthorizingHandleBeforeEvent(context, type);
             eventPublisher.publishEvent(event);
             if (!event.isExecute()) {
                 if (event.isAllow()) {

hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/src/main/java/org/hswebframework/web/service/file/oauth2/OAuth2FileService.java

@@ -37,22 +37,24 @@ public class OAuth2FileService implements FileService, OAuth2ServiceSupport {
     @Override
     public FileInfoEntity saveFile(InputStream fileStream, String fileName, String type, String creatorId) throws IOException {
         return createRequest("/upload")
-                .upload("file", fileStream,fileName)
+                .upload("file", fileStream, fileName)
                 .as(getEntityType());
     }
 
     @Override
     public String saveStaticFile(InputStream fileStream, String fileName) throws IOException {
         return createRequest("/upload-static")
-                .upload("file", fileStream,fileName)
+                .upload("file", fileStream, fileName)
                 .as(String.class);
     }
 
     @Override
     public void writeFile(String fileId, OutputStream out, long skip) throws IOException {
-        StreamUtils.copy(createRequest("/download/" + fileId)
+        try (InputStream stream = createRequest("/download/" + fileId)
                 .header("Range", "bytes=" + skip)
-                .get().asStream(), out);
+                .get().asStream()) {
+            StreamUtils.copy(stream, out);
+        }
     }
 
     @Override

pom.xml

@@ -249,11 +249,10 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>2.1.8</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>io.reactivex.rxjava2</groupId>-->
+            <!--<artifactId>rxjava</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -288,7 +287,7 @@
             <dependency>
                 <groupId>io.reactivex.rxjava2</groupId>
                 <artifactId>rxjava</artifactId>
-                <version>2.1.6</version>
+                <version>2.1.8</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>