diff --git a/pom.xml b/pom.xml
index 87fbd45..00952d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,11 +143,6 @@
lombok
true
-
-
- com.mysql
- mysql-connector-j
-
diff --git a/src/main/java/me/qwq/doghouse/flexmark/ext/mermaid/MermaidNodeRenderer.java b/src/main/java/me/qwq/doghouse/flexmark/ext/mermaid/MermaidNodeRenderer.java
index 952ead1..42922ec 100644
--- a/src/main/java/me/qwq/doghouse/flexmark/ext/mermaid/MermaidNodeRenderer.java
+++ b/src/main/java/me/qwq/doghouse/flexmark/ext/mermaid/MermaidNodeRenderer.java
@@ -14,7 +14,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jsoup.Jsoup;
@@ -40,6 +39,7 @@ import me.qwq.doghouse.config.DoghouseProperties;
import me.qwq.doghouse.pojo.bo.ThemeInfo;
import me.qwq.doghouse.service.ThemeService;
import me.qwq.doghouse.util.Cryptos;
+import me.qwq.doghouse.util.OSUtils;
import me.qwq.doghouse.util.SpringContextHolder;
@Slf4j
@@ -178,6 +178,13 @@ public class MermaidNodeRenderer implements NodeRenderer {
}
try {
+
+ if (OSUtils.isWindows()) {
+ cmd.addFirst("/C");
+ cmd.addFirst("/S");
+ cmd.addFirst("cmd.exe");
+ }
+
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.redirectErrorStream(true);
Process process = pb.start();
@@ -224,7 +231,7 @@ public class MermaidNodeRenderer implements NodeRenderer {
Files.delete(svgFilePath);
renderPlainDiv(node, html, htmlOptions);
}
- renderSvg(node, html, htmlOptions, Files.readString(svgFilePath));
+ renderSvg(node, html, htmlOptions, svgContent);
} catch (Exception e) {
log.warn("Failed to load mermaid rendered svg: {}", svgFile.getPath(), e);
renderPlainDiv(node, html, htmlOptions);
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index c169df2..4b16ed3 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -14,7 +14,7 @@
),
days AS (
SELECT
- DATE('now', '-' || n || ' day') AS generatedDate
+ DATE('now', 'localtime', '-' || n || ' day') AS generatedDate
FROM numbers
),
post_data AS (
@@ -23,7 +23,7 @@
COUNT(post_id) AS postCount
FROM post
WHERE
- DATE(create_time) >= DATE('now', '-' || #{passDays} || ' day')
+ DATE(create_time) >= DATE('now', 'localtime', '-' || #{passDays} || ' day')
AND post_status = 0
AND is_deleted = 0
@@ -37,7 +37,7 @@
COUNT(id) AS commentCount
FROM comment
WHERE
- DATE(create_time) >= DATE('now', '-' || #{passDays} || ' day')
+ DATE(create_time) >= DATE('now', 'localtime', '-' || #{passDays} || ' day')
AND comment_status = 0
AND is_deleted = 0
GROUP BY DATE(create_time)