From ffaf8f4bf454f514844e4b8dd8c338ea149d2c2c Mon Sep 17 00:00:00 2001
From: luojing <13968186856@139.com>
Date: Mon, 23 Nov 2020 13:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BF=E5=90=8D=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E9=99=84=E4=BB=B6=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/x/general/assemble/control/jaxrs/FileJaxrsFilter.java   | 2 +-
 .../general/assemble/control/jaxrs/file/GeneralFileAction.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/FileJaxrsFilter.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/FileJaxrsFilter.java
index 4847a34e1d..9f96a73a01 100644
--- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/FileJaxrsFilter.java
+++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/FileJaxrsFilter.java
@@ -4,7 +4,7 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
 
 import javax.servlet.annotation.WebFilter;
 
-@WebFilter(urlPatterns = "/jaxrs/file/*", asyncSupported = true)
+@WebFilter(urlPatterns = "/jaxrs/generalfile/*", asyncSupported = true)
 public class FileJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter {
 
 }
diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/GeneralFileAction.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/GeneralFileAction.java
index b597d403fc..d3b8ea0982 100644
--- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/GeneralFileAction.java
+++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/GeneralFileAction.java
@@ -17,7 +17,7 @@ import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-@Path("file")
+@Path("generalfile")
 @JaxrsDescribe("获取附件")
 public class GeneralFileAction extends StandardJaxrsAction {
 
-- 
GitLab