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

修改登录鉴权时间

parent a4f7bd2e
...@@ -76,8 +76,11 @@ public class ZipUtils { ...@@ -76,8 +76,11 @@ public class ZipUtils {
Set<String> set = new HashSet<>(); Set<String> set = new HashSet<>();
TarArchiveInputStream fin =null; TarArchiveInputStream fin =null;
FileOutputStream fileOutputStream =null; FileOutputStream fileOutputStream =null;
GzipCompressorInputStream gzipCompressorInputStream = null;
try { try {
fin = new TarArchiveInputStream(new GzipCompressorInputStream(inputStream)); gzipCompressorInputStream = new GzipCompressorInputStream(inputStream);
fin = new TarArchiveInputStream(gzipCompressorInputStream);
log.info("********开始执行gzip"); log.info("********开始执行gzip");
TarArchiveEntry entry; TarArchiveEntry entry;
...@@ -96,7 +99,7 @@ public class ZipUtils { ...@@ -96,7 +99,7 @@ public class ZipUtils {
// 将文件写出到解压的目录 // 将文件写出到解压的目录
fileOutputStream = new FileOutputStream(curfile); fileOutputStream = new FileOutputStream(curfile);
IOUtils.copy(fin, fileOutputStream); IOUtils.copy(fin, fileOutputStream);
set.add(curfile.getAbsolutePath()); //set.add(curfile.getAbsolutePath());
} }
} catch (IOException e) { } catch (IOException e) {
...@@ -106,15 +109,16 @@ public class ZipUtils { ...@@ -106,15 +109,16 @@ public class ZipUtils {
inputStream.close(); inputStream.close();
fin.close(); fin.close();
fileOutputStream.close(); fileOutputStream.close();
gzipCompressorInputStream.close();
} catch (IOException e) { } catch (IOException e) {
log.error("关闭流失败", e); log.error("关闭流失败", e);
} }
} }
if (localFiles == null) { // if (localFiles == null) {
localFiles = set; // localFiles = set;
} else { // } else {
localFiles.addAll(set); // localFiles.addAll(set);
} // }
return set; return set;
} }
......
...@@ -127,22 +127,6 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec ...@@ -127,22 +127,6 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
//后端服务,创建service 启动服务 //后端服务,创建service 启动服务
//RuntimeUtil.exec() //RuntimeUtil.exec()
Runnable runnable = new Runnable() {
@Override
public void run() {
log.info("执行deploy shell 脚本 或者构造文件,{}",publicPath+"/bin/");
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
callScript("project_deploy.sh","4",publicPath+"/bin/");
}
};
ThreadPool.getInstance().execute(runnable);
//callScript("project_deploy.sh","4",publicPath+"/bin/"); //callScript("project_deploy.sh","4",publicPath+"/bin/");
} else if (SystemUtil.getOsInfo().isWindows()) { } else if (SystemUtil.getOsInfo().isWindows()) {
//todo //todo
......
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