Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
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
Commits
c0e46974
Commit
c0e46974
authored
Feb 11, 2014
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级到 latke 1.0.6
默认事务隔离:REPEATABLE_READ;默认数据库连接池:druid
parent
cbee7328
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
16 deletions
+18
-16
core/src/main/java/org/b3log/solo/processor/util/Filler.java
core/src/main/java/org/b3log/solo/processor/util/Filler.java
+12
-11
pom.xml
pom.xml
+1
-1
war/h2/src/main/resources/local.properties
war/h2/src/main/resources/local.properties
+1
-1
war/mysql/src/main/resources/local.properties
war/mysql/src/main/resources/local.properties
+4
-3
No files found.
core/src/main/java/org/b3log/solo/processor/util/Filler.java
View file @
c0e46974
...
@@ -68,7 +68,7 @@ import org.json.JSONObject;
...
@@ -68,7 +68,7 @@ import org.json.JSONObject;
* Filler utilities.
* Filler utilities.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.6.
9, Oct 29, 2013
* @version 1.0.6.
10, Feb 11, 2014
* @since 0.3.1
* @since 0.3.1
*/
*/
@Service
@Service
...
@@ -368,7 +368,7 @@ public class Filler {
...
@@ -368,7 +368,7 @@ public class Filler {
archiveDates2
.
add
(
archiveDates
.
get
(
0
));
archiveDates2
.
add
(
archiveDates
.
get
(
0
));
// XXX: Workaround, remove the duplicated archive dates
if
(
1
<
archiveDates
.
size
())
{
// XXX: Workaround, remove the duplicated archive dates
for
(
final
JSONObject
archiveDate
:
archiveDates
)
{
for
(
final
JSONObject
archiveDate
:
archiveDates
)
{
final
long
time
=
archiveDate
.
getLong
(
ArchiveDate
.
ARCHIVE_TIME
);
final
long
time
=
archiveDate
.
getLong
(
ArchiveDate
.
ARCHIVE_TIME
);
final
String
dateString
=
DateFormatUtils
.
format
(
time
,
"yyyy/MM"
);
final
String
dateString
=
DateFormatUtils
.
format
(
time
,
"yyyy/MM"
);
...
@@ -382,6 +382,7 @@ public class Filler {
...
@@ -382,6 +382,7 @@ public class Filler {
LOGGER
.
log
(
Level
.
WARN
,
"Found a duplicated archive date [{0}]"
,
dateString
);
LOGGER
.
log
(
Level
.
WARN
,
"Found a duplicated archive date [{0}]"
,
dateString
);
}
}
}
}
}
final
String
localeString
=
preference
.
getString
(
Preference
.
LOCALE_STRING
);
final
String
localeString
=
preference
.
getString
(
Preference
.
LOCALE_STRING
);
final
String
language
=
Locales
.
getLanguage
(
localeString
);
final
String
language
=
Locales
.
getLanguage
(
localeString
);
...
...
pom.xml
View file @
c0e46974
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<properties>
<properties>
<servlet.version>
2.5
</servlet.version>
<servlet.version>
2.5
</servlet.version>
<slf4j.version>
1.7.5
</slf4j.version>
<slf4j.version>
1.7.5
</slf4j.version>
<org.b3log.latke.version>
1.0.
5
</org.b3log.latke.version>
<org.b3log.latke.version>
1.0.
6
</org.b3log.latke.version>
<maven-gae-plugin.version>
0.9.0
</maven-gae-plugin.version>
<maven-gae-plugin.version>
0.9.0
</maven-gae-plugin.version>
<gae.version>
1.8.1.1
</gae.version>
<gae.version>
1.8.1.1
</gae.version>
...
...
war/h2/src/main/resources/local.properties
View file @
c0e46974
...
@@ -39,7 +39,7 @@ jdbc.minConnCnt=3
...
@@ -39,7 +39,7 @@ jdbc.minConnCnt=3
jdbc.maxConnCnt
=
10
jdbc.maxConnCnt
=
10
# Be care to change the transaction isolation
# Be care to change the transaction isolation
jdbc.transactionIsolation
=
RE
AD_COMMITTE
D
jdbc.transactionIsolation
=
RE
PEATABLE_REA
D
# The specific table name prefix
# The specific table name prefix
jdbc.tablePrefix
=
b3_solo
jdbc.tablePrefix
=
b3_solo
...
...
war/mysql/src/main/resources/local.properties
View file @
c0e46974
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if B3log Solo runs on Google App Engine.
# it is unnecessary to care this file if B3log Solo runs on Google App Engine.
# Version: 1.0.2.
4, Apr 1, 2013
# Version: 1.0.2.
5, Feb 11, 2014
# Author: Liang Ding
# Author: Liang Ding
#
#
...
@@ -33,14 +33,15 @@ jdbc.password=
...
@@ -33,14 +33,15 @@ jdbc.password=
# database connection pool
# database connection pool
#jdbc.pool=BoneCP
#jdbc.pool=BoneCP
jdbc.pool
=
c3p0
#jdbc.pool=c3p0
jdbc.pool
=
druid
# The minConnCnt MUST larger or equal to 3
# The minConnCnt MUST larger or equal to 3
jdbc.minConnCnt
=
3
jdbc.minConnCnt
=
3
jdbc.maxConnCnt
=
10
jdbc.maxConnCnt
=
10
# Be care to change the transaction isolation
# Be care to change the transaction isolation
jdbc.transactionIsolation
=
RE
AD_COMMITTE
D
jdbc.transactionIsolation
=
RE
PEATABLE_REA
D
# The specific table name prefix
# The specific table name prefix
jdbc.tablePrefix
=
b3_solo
jdbc.tablePrefix
=
b3_solo
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