|
@@ -623,9 +623,9 @@ public class FileUtil {
|
|
* @param zipFileName 压缩zip文件路径+文件名
|
|
* @param zipFileName 压缩zip文件路径+文件名
|
|
*/
|
|
*/
|
|
public static void downloadEncryptZip(HttpServletResponse response, File downloadPathFile, String zipFileName, String password) {
|
|
public static void downloadEncryptZip(HttpServletResponse response, File downloadPathFile, String zipFileName, String password) {
|
|
- if (StringUtils.isBlank(password)) {
|
|
|
|
- password = SystemConstant.ZIP_ENCRYPT_PWD;
|
|
|
|
- }
|
|
|
|
|
|
+// if (StringUtils.isBlank(password)) {
|
|
|
|
+// password = SystemConstant.ZIP_ENCRYPT_PWD;
|
|
|
|
+// }
|
|
// 压缩zip文件和图片保存文件夹放在同一级
|
|
// 压缩zip文件和图片保存文件夹放在同一级
|
|
File zipFile = new File(downloadPathFile.getParent(), zipFileName);
|
|
File zipFile = new File(downloadPathFile.getParent(), zipFileName);
|
|
try {
|
|
try {
|