From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/component/ueditor/ActionEnter.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/component/ueditor/ActionEnter.java b/zq-erp/src/main/java/com/matrix/component/ueditor/ActionEnter.java
index 5a4486f..e5805e6 100644
--- a/zq-erp/src/main/java/com/matrix/component/ueditor/ActionEnter.java
+++ b/zq-erp/src/main/java/com/matrix/component/ueditor/ActionEnter.java
@@ -7,6 +7,7 @@
import com.matrix.component.ueditor.hunter.ImageHunter;
import com.matrix.component.ueditor.upload.Uploader;
import com.matrix.component.ueditor.define.State;
+
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -21,14 +22,16 @@
private String actionType = null;
private ConfigManager configManager = null;
+ private UeditorProperties ueditorProperties = null;
- public ActionEnter ( HttpServletRequest request, String rootPath ) {
+ public ActionEnter (HttpServletRequest request, String rootPath , UeditorProperties ueditorProperties) {
this.request = request;
this.rootPath = rootPath;
this.actionType = request.getParameter( "action" );
this.contextPath = request.getContextPath();
- this.configManager = ConfigManager.getInstance( this.rootPath, this.contextPath, request.getRequestURI() );
+ this.ueditorProperties=ueditorProperties;
+ this.configManager = ConfigManager.getInstance( this.rootPath, this.contextPath, request.getRequestURI() ,ueditorProperties );
}
--
Gitblit v1.9.1