From 6bfebcce4b7ab69c97245dec253587a53fa32fd8 Mon Sep 17 00:00:00 2001
From: Doghole <huocaizhu@gmail.com>
Date: Wed, 31 Dec 2025 11:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20mysql-connector-j=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20ProcessBuilder=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=A7=E8=A1=8C=20Windows=20=E4=B8=8A=20no?=
 =?UTF-8?q?de=20=E5=AE=89=E8=A3=85=E7=9A=84=20mmdc=20=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=AD=A3=E5=9B=A0=E6=97=B6=E5=8C=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=20Statistics=20=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=96=B9=E6=B3=95=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  5 -----
 .../flexmark/ext/mermaid/MermaidNodeRenderer.java     | 11 +++++++++--
 src/main/resources/mapper/StatisticsMapper.xml        |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 87fbd45..00952d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,11 +143,6 @@
       <artifactId>lombok</artifactId>
       <optional>true</optional>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
-    <dependency>
-      <groupId>com.mysql</groupId>
-      <artifactId>mysql-connector-j</artifactId>
-    </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
     <dependency>
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
                 <if test="postType != null">
@@ -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)