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
85e9a9dd
Commit
85e9a9dd
authored
Oct 29, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录鉴权时间
parent
8cab031c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupDbServiceImpl.java
...als/xhx/module/setup/service/impl/SetupDbServiceImpl.java
+3
-1
setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java
...hx/module/setup/service/impl/SetupProjectServiceImpl.java
+10
-2
No files found.
setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupDbServiceImpl.java
View file @
85e9a9dd
...
...
@@ -58,7 +58,9 @@ public class SetupDbServiceImpl implements SetupDbService {
}
catch
(
Exception
e
)
{
log
.
error
(
"初始化数据库异常"
,
e
);
return
Rest
.
fail
(
e
.
getMessage
());
}
finally
{
}
return
Rest
.
ok
(
"初始化数据成功!"
);
}
...
...
setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java
View file @
85e9a9dd
...
...
@@ -101,6 +101,14 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
ZipUtils
.
unGzip
(
inputStream
,
setupProjectEntity
.
getProjectPath
());
if
(
inputStream
!=
null
){
try
{
inputStream
.
close
();
}
catch
(
IOException
e
)
{
// throw new RuntimeException(e);
}
}
String
publicPath
=
setupProjectEntity
.
getProjectPath
()
+
ProductDisEnum
.
getByValue
(
setupProjectEntity
.
getProjectCode
()).
getValue
();
//导入数据库业务
...
...
@@ -112,10 +120,10 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
dbSetupEntity
.
setPassword
(
setupProjectEntity
.
getDbPassword
());
dbSetupEntity
.
setDbFilePath
(
publicPath
+
"/db/base.sql"
);
log
.
info
(
"数据库db路径!{}"
,
dbSetupEntity
.
getDbFilePath
());
Rest
<
String
>
dbRest
=
setupDbService
.
initDb
(
dbSetupEntity
);
/*
Rest<String> dbRest = setupDbService.initDb(dbSetupEntity);
if (YesNoEnum.YES.getValue() != dbRest.getCode()) {
log.info("数据库初始化成功!");
}
}
*/
setupProjectEntity
.
setProjectStatus
(
ProjectStatusEnum
.
已部署
.
getValue
());
this
.
update
(
setupProjectEntity
);
...
...
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