Merge remote-tracking branch 'origin/master'

service-manager/src/main/java/com/winsun/controller/PackageController.java

@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 
 /**
 /**
  * @Author: chancy
  * @Author: chancy
@@ -51,6 +52,8 @@ public class PackageController extends BaseController {
 
 
     private static final String XIAOTUFILENAME = "logo.png";
     private static final String XIAOTUFILENAME = "logo.png";
 
 
+    private static final Pattern FilePattern = Pattern.compile("[\\\\/:*?\"<>|]");
+
 
 
     @Autowired
     @Autowired
     public PackageController(PackageMapper packageMapper, SchoolPackageMapper schoolPackageMapper) {
     public PackageController(PackageMapper packageMapper, SchoolPackageMapper schoolPackageMapper) {
@@ -203,7 +206,7 @@ public class PackageController extends BaseController {
             Package aPackage = packageMapper.selectById(id);
             Package aPackage = packageMapper.selectById(id);
             basePath.append(aPackage.getId());
             basePath.append(aPackage.getId());
         }
         }
-        File dir = new File(basePath.toString());
+        File dir = new File(FilePattern.matcher(basePath.toString()).replaceAll(""));
         if (!dir.exists()) {
         if (!dir.exists()) {
             dir.mkdirs();
             dir.mkdirs();
         }
         }