Commit 18e0dd01 by java-lixy

上传文件

parent 730e554e
...@@ -10,8 +10,10 @@ import com.ckfinder.connector.configuration.Configuration; ...@@ -10,8 +10,10 @@ import com.ckfinder.connector.configuration.Configuration;
import com.ckfinder.connector.data.AccessControlLevel; import com.ckfinder.connector.data.AccessControlLevel;
import com.ckfinder.connector.utils.AccessControlUtil; import com.ckfinder.connector.utils.AccessControlUtil;
import com.ejweb.conf.GConstants; import com.ejweb.conf.GConstants;
import com.ejweb.core.utils.FileUtils;
import com.ejweb.modules.sys.security.SystemAuthorizingRealm.Principal; import com.ejweb.modules.sys.security.SystemAuthorizingRealm.Principal;
import com.ejweb.modules.sys.utils.UserUtils; import com.ejweb.modules.sys.utils.UserUtils;
import org.mozilla.javascript.tools.shell.Global;
/** /**
* CKFinder配置 * CKFinder配置
...@@ -51,8 +53,11 @@ public class CKFinderConfig extends Configuration { ...@@ -51,8 +53,11 @@ public class CKFinderConfig extends Configuration {
try { try {
// Principal principal = (Principal)SecurityUtils.getSubject().getPrincipal(); // Principal principal = (Principal)SecurityUtils.getSubject().getPrincipal();
// this.baseURL = ServletContextFactory.getServletContext().getContextPath()+"/userfiles/"+principal+"/"; // this.baseURL = ServletContextFactory.getServletContext().getContextPath()+"/userfiles/"+principal+"/";
this.baseURL = GConstants.getBaseUrl(Servlets.getRequest());// 图片前缀//FileUtils.path(Servlets.getRequest().getContextPath() + GConstants.USERFILES_BASE_URL + principal + "/"); // this.baseURL = GConstants.getBaseUrl(Servlets.getRequest());// 图片前缀//FileUtils.path(Servlets.getRequest().getContextPath() + GConstants.USERFILES_BASE_URL + principal + "/");
this.baseDir = GConstants.getUserfilesBaseDir();// 文件地址根目录//FileUtils.path(GConstants.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/"); // this.baseDir = GConstants.getUserfilesBaseDir();// 文件地址根目录//FileUtils.path(GConstants.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/");
this.baseURL = GConstants.getBaseUrl(Servlets.getRequest()) + GConstants.USERFILES_BASE_URL + "/"+principal + "/";
this.baseDir = GConstants.getUserfilesBaseDir() + GConstants.USERFILES_BASE_URL +"/"+ principal + "/";
// System.out.println("=================================================================="); // System.out.println("==================================================================");
// System.out.println(" CKFinderConfig.createConfigurationInstance.baseURL:"+baseURL+" "); // System.out.println(" CKFinderConfig.createConfigurationInstance.baseURL:"+baseURL+" ");
// System.out.println(" CKFinderConfig.createConfigurationInstance.baseDir:"+baseDir+" "); // System.out.println(" CKFinderConfig.createConfigurationInstance.baseDir:"+baseDir+" ");
......
...@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
import com.ckfinder.connector.ConnectorServlet; import com.ckfinder.connector.ConnectorServlet;
import com.ejweb.conf.GConstants; import com.ejweb.conf.GConstants;
import com.ejweb.core.utils.FileManipulation; import com.ejweb.core.utils.FileManipulation;
import com.ejweb.core.utils.FileUtils;
import com.ejweb.modules.sys.security.SystemAuthorizingRealm.Principal; import com.ejweb.modules.sys.security.SystemAuthorizingRealm.Principal;
import com.ejweb.modules.sys.utils.UserUtils; import com.ejweb.modules.sys.utils.UserUtils;
...@@ -54,16 +55,16 @@ public class CKFinderConnectorServlet extends ConnectorServlet { ...@@ -54,16 +55,16 @@ public class CKFinderConnectorServlet extends ConnectorServlet {
if (startupPath!=null){ if (startupPath!=null){
String[] ss = startupPath.split(":"); String[] ss = startupPath.split(":");
if (ss.length==2){ if (ss.length==2){
// String realPath = GConstants.getUserfilesBaseDir() + GConstants.USERFILES_BASE_URL String realPath = GConstants.getUserfilesBaseDir() + GConstants.USERFILES_BASE_URL
// + principal + "/" + ss[0] + ss[1]; + "/"+principal + "/" + ss[0] + ss[1];
// FileUtils.createDirectory(FileUtils.path(realPath)); FileUtils.createDirectory(FileUtils.path(realPath));
String realPath = GConstants.getUserfilesBaseDir() + "/" + ss[0] + ss[1]; // String realPath = GConstants.getUserfilesBaseDir() + "/" + ss[0] + ss[1];
realPath= FileManipulation.validateFile(realPath); // realPath= FileManipulation.validateFile(realPath);
File fileRealPath = new File(FileManipulation.validateFile(realPath)); // File fileRealPath = new File(FileManipulation.validateFile(realPath));
if(fileRealPath.exists() == false){ // if(fileRealPath.exists() == false){
fileRealPath.mkdirs(); // fileRealPath.mkdirs();
} // }
} }
} }
} else if ("QuickUpload".equals(command) && type != null){// 快捷上传,自动创建当前文件夹,并上传到该路径 } else if ("QuickUpload".equals(command) && type != null){// 快捷上传,自动创建当前文件夹,并上传到该路径
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment