Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
e0c5464c
Unverified
Commit
e0c5464c
authored
Mar 20, 2019
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
避免重启
parent
5d6355cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
21 deletions
+2
-21
src/main/java/org/b3log/solo/service/ImportService.java
src/main/java/org/b3log/solo/service/ImportService.java
+1
-11
src/main/java/org/b3log/solo/upgrade/V300_310.java
src/main/java/org/b3log/solo/upgrade/V300_310.java
+1
-10
No files found.
src/main/java/org/b3log/solo/service/ImportService.java
View file @
e0c5464c
...
@@ -21,7 +21,6 @@ import org.apache.commons.io.FileUtils;
...
@@ -21,7 +21,6 @@ import org.apache.commons.io.FileUtils;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Latkes
;
import
org.b3log.latke.ioc.Inject
;
import
org.b3log.latke.ioc.Inject
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.logging.Logger
;
...
@@ -40,7 +39,7 @@ import java.util.*;
...
@@ -40,7 +39,7 @@ import java.util.*;
* Import service.
* Import service.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.
4, Mar 17
, 2019
* @version 1.0.1.
5, Mar 20
, 2019
* @since 2.2.0
* @since 2.2.0
*/
*/
@Service
@Service
...
@@ -89,12 +88,6 @@ public class ImportService {
...
@@ -89,12 +88,6 @@ public class ImportService {
return
;
return
;
}
}
String
serverHost
=
Latkes
.
getLatkeProperty
(
"serverHost"
);
if
(
StringUtils
.
isBlank
(
serverHost
))
{
serverHost
=
"localhost"
;
Latkes
.
setLatkeProperty
(
"serverHost"
,
serverHost
);
}
final
String
adminId
=
admin
.
optString
(
Keys
.
OBJECT_ID
);
final
String
adminId
=
admin
.
optString
(
Keys
.
OBJECT_ID
);
int
succCnt
=
0
,
failCnt
=
0
;
int
succCnt
=
0
,
failCnt
=
0
;
...
@@ -146,9 +139,6 @@ public class ImportService {
...
@@ -146,9 +139,6 @@ public class ImportService {
logBuilder
.
append
(
" :p"
);
logBuilder
.
append
(
" :p"
);
}
}
LOGGER
.
info
(
logBuilder
.
toString
());
LOGGER
.
info
(
logBuilder
.
toString
());
LOGGER
.
log
(
Level
.
INFO
,
"Imported articles, please restart Solo"
);
System
.
exit
(
0
);
}).
start
();
}).
start
();
}
}
...
...
src/main/java/org/b3log/solo/upgrade/V300_310.java
View file @
e0c5464c
...
@@ -41,7 +41,7 @@ import java.util.List;
...
@@ -41,7 +41,7 @@ import java.util.List;
* Upgrade script from v3.0.0 to v3.1.0.
* Upgrade script from v3.0.0 to v3.1.0.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.
0, Mar 4
, 2019
* @version 1.0.1.
1, Mar 20
, 2019
* @since 3.1.0
* @since 3.1.0
*/
*/
public
final
class
V300_310
{
public
final
class
V300_310
{
...
@@ -63,12 +63,6 @@ public final class V300_310 {
...
@@ -63,12 +63,6 @@ public final class V300_310 {
final
OptionRepository
optionRepository
=
beanManager
.
getReference
(
OptionRepository
.
class
);
final
OptionRepository
optionRepository
=
beanManager
.
getReference
(
OptionRepository
.
class
);
final
ArticleRepository
articleRepository
=
beanManager
.
getReference
(
ArticleRepository
.
class
);
final
ArticleRepository
articleRepository
=
beanManager
.
getReference
(
ArticleRepository
.
class
);
String
serverHost
=
Latkes
.
getLatkeProperty
(
"serverHost"
);
if
(
StringUtils
.
isBlank
(
serverHost
))
{
serverHost
=
"localhost"
;
Latkes
.
setLatkeProperty
(
"serverHost"
,
serverHost
);
}
try
{
try
{
Connection
connection
=
Connections
.
getConnection
();
Connection
connection
=
Connections
.
getConnection
();
Statement
statement
=
connection
.
createStatement
();
Statement
statement
=
connection
.
createStatement
();
...
@@ -107,9 +101,6 @@ public final class V300_310 {
...
@@ -107,9 +101,6 @@ public final class V300_310 {
}
}
transaction
.
commit
();
transaction
.
commit
();
LOGGER
.
log
(
Level
.
INFO
,
"Upgraded from version [3.0.0] to version [3.1.0] successfully, please restart Solo"
);
System
.
exit
(
0
);
}
catch
(
final
Exception
e
)
{
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Upgrade failed!"
,
e
);
LOGGER
.
log
(
Level
.
ERROR
,
"Upgrade failed!"
,
e
);
...
...
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