Commit aee4c6f7 authored by 赵啸非's avatar 赵啸非

修改登录鉴权时间

parent 85e9a9dd
...@@ -75,6 +75,7 @@ public class ZipUtils { ...@@ -75,6 +75,7 @@ public class ZipUtils {
public static Set<String> unGzip(InputStream inputStream, String unZipPath) { public static Set<String> unGzip(InputStream inputStream, String unZipPath) {
Set<String> set = new HashSet<>(); Set<String> set = new HashSet<>();
TarArchiveInputStream fin =null; TarArchiveInputStream fin =null;
FileOutputStream fileOutputStream =null;
try { try {
fin = new TarArchiveInputStream(new GzipCompressorInputStream(inputStream)); fin = new TarArchiveInputStream(new GzipCompressorInputStream(inputStream));
...@@ -93,17 +94,18 @@ public class ZipUtils { ...@@ -93,17 +94,18 @@ public class ZipUtils {
parent.mkdirs(); parent.mkdirs();
} }
// 将文件写出到解压的目录 // 将文件写出到解压的目录
IOUtils.copy(fin, new FileOutputStream(curfile)); fileOutputStream = new FileOutputStream(curfile);
IOUtils.copy(fin, fileOutputStream);
set.add(curfile.getAbsolutePath()); set.add(curfile.getAbsolutePath());
} }
} catch (IOException e) { } catch (IOException e) {
log.error("解压tar.gz文件失败", e); log.error("解压tar.gz文件失败", e);
}finally { }finally {
try { try {
inputStream.close(); inputStream.close();
fin.close(); fin.close();
fileOutputStream.close();
} catch (IOException e) { } catch (IOException e) {
log.error("关闭流失败", e); log.error("关闭流失败", e);
} }
......
...@@ -120,10 +120,10 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec ...@@ -120,10 +120,10 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
dbSetupEntity.setPassword(setupProjectEntity.getDbPassword()); dbSetupEntity.setPassword(setupProjectEntity.getDbPassword());
dbSetupEntity.setDbFilePath(publicPath + "/db/base.sql"); dbSetupEntity.setDbFilePath(publicPath + "/db/base.sql");
log.info("数据库db路径!{}", dbSetupEntity.getDbFilePath()); log.info("数据库db路径!{}", dbSetupEntity.getDbFilePath());
/* Rest<String> dbRest = setupDbService.initDb(dbSetupEntity); Rest<String> dbRest = setupDbService.initDb(dbSetupEntity);
if (YesNoEnum.YES.getValue() != dbRest.getCode()) { if (YesNoEnum.YES.getValue() != dbRest.getCode()) {
log.info("数据库初始化成功!"); log.info("数据库初始化成功!");
}*/ }
setupProjectEntity.setProjectStatus(ProjectStatusEnum.已部署.getValue()); setupProjectEntity.setProjectStatus(ProjectStatusEnum.已部署.getValue());
this.update(setupProjectEntity); this.update(setupProjectEntity);
......
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