上传文件

src/main/java/com/ejweb/core/web/CKFinderConfig.java

@@ -10,8 +10,10 @@ import com.ckfinder.connector.configuration.Configuration;
 import com.ckfinder.connector.data.AccessControlLevel;
 import com.ckfinder.connector.utils.AccessControlUtil;
 import com.ejweb.conf.GConstants;
+import com.ejweb.core.utils.FileUtils;
 import com.ejweb.modules.sys.security.SystemAuthorizingRealm.Principal;
 import com.ejweb.modules.sys.utils.UserUtils;
+import org.mozilla.javascript.tools.shell.Global;
 
 /**
  * CKFinder配置
@@ -21,9 +23,9 @@ import com.ejweb.modules.sys.utils.UserUtils;
 public class CKFinderConfig extends Configuration {
 
     public CKFinderConfig(ServletConfig servletConfig) {
-        super(servletConfig);  
+        super(servletConfig);
     }
-    
+
     @Override
     protected Configuration createConfigurationInstance() {
         Principal principal = (Principal) UserUtils.getPrincipal();
@@ -51,8 +53,11 @@ public class CKFinderConfig extends Configuration {
         try {
 //            Principal principal = (Principal)SecurityUtils.getSubject().getPrincipal();
 //            this.baseURL = ServletContextFactory.getServletContext().getContextPath()+"/userfiles/"+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.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.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("       CKFinderConfig.createConfigurationInstance.baseURL:"+baseURL+"                                        ");
 //            System.out.println("       CKFinderConfig.createConfigurationInstance.baseDir:"+baseDir+"                                        ");

src/main/java/com/ejweb/core/web/CKFinderConnectorServlet.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ckfinder.connector.ConnectorServlet;
 import com.ejweb.conf.GConstants;
 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.utils.UserUtils;
 
@@ -54,16 +55,16 @@ public class CKFinderConnectorServlet extends ConnectorServlet {
                 if (startupPath!=null){
                     String[] ss = startupPath.split(":");
                     if (ss.length==2){
-//                        String realPath = GConstants.getUserfilesBaseDir() + GConstants.USERFILES_BASE_URL
-//                                + principal + "/" + ss[0] + ss[1];
-//                        FileUtils.createDirectory(FileUtils.path(realPath));
+                        String realPath = GConstants.getUserfilesBaseDir() + GConstants.USERFILES_BASE_URL
+                                + "/"+principal + "/" + ss[0] + ss[1];
+                        FileUtils.createDirectory(FileUtils.path(realPath));
                         
-                        String realPath = GConstants.getUserfilesBaseDir() + "/" + ss[0] + ss[1];
-                        realPath= FileManipulation.validateFile(realPath);
-                        File fileRealPath = new File(FileManipulation.validateFile(realPath));
-                        if(fileRealPath.exists() == false){
-                            fileRealPath.mkdirs();
-                        }
+//                        String realPath = GConstants.getUserfilesBaseDir() + "/" + ss[0] + ss[1];
+//                        realPath= FileManipulation.validateFile(realPath);
+//                        File fileRealPath = new File(FileManipulation.validateFile(realPath));
+//                        if(fileRealPath.exists() == false){
+//                            fileRealPath.mkdirs();
+//                        }
                     }
                 }
             } else if ("QuickUpload".equals(command) && type != null){// 快捷上传，自动创建当前文件夹，并上传到该路径