Merge remote-tracking branch 'origin/leng_dev' into leng_dev

This commit is contained in:
冷冷 committed 2019-02-11 10:09:42 +08:00
commit aab12ed70b
8 files changed
+18 -9

No files matched your search

@@ -40,6 +40,7 @@ import org.apache.velocity.app.Velocity;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -200,7 +201,7 @@ public class GenUtils {
zip.putNextEntry(new ZipEntry(Objects
.requireNonNull(getFileName(template, tableEntity.getCaseClassName()
, map.get("package").toString(), map.get("moduleName").toString()))));
IoUtil.write(zip, CharsetUtil.UTF_8, false, sw.toString());
IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString());
IoUtil.close(sw);
zip.closeEntry();
} catch (IOException e) {