Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setup-manager
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
setup-manager
Commits
a26e2dab
Commit
a26e2dab
authored
Oct 29, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录鉴权时间
parent
a4f7bd2e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
23 deletions
+11
-23
setup-project-manager/src/main/java/com/mortals/xhx/common/utils/ZipUtils.java
.../src/main/java/com/mortals/xhx/common/utils/ZipUtils.java
+11
-7
setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java
...hx/module/setup/service/impl/SetupProjectServiceImpl.java
+0
-16
No files found.
setup-project-manager/src/main/java/com/mortals/xhx/common/utils/ZipUtils.java
View file @
a26e2dab
...
@@ -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
;
}
}
...
...
setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java
View file @
a26e2dab
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment