From 4e8caf4c5360598ace887d9710630bfcae003c98 Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Mon, 14 Apr 2025 12:42:40 +0800
Subject: [PATCH] update dev.sh

---
 dev.ps1 | 23 +++++++----------------
 dev.sh  | 17 +++++++----------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/dev.ps1 b/dev.ps1
index a0d13f9..73003fc 100644
--- a/dev.ps1
+++ b/dev.ps1
@@ -1,16 +1,7 @@
-# 定义颜色变量
-$PINK = "$([char]27)[33m"
-$GREEN = "$([char]27)[32m"
-$NC = "$([char]27)[0m"
-
-Start-Job -ScriptBlock {
-    cd renderer
-    npm run serve | ForEach-Object { "$using:PINK[renderer]$using:NC $_" }
-}
-
-Start-Job -ScriptBlock {
-    cd service
-    npm run serve | ForEach-Object { "$using:GREEN[service]$using:NC $_" }
-}
-
-Get-Job | Wait-Job | Receive-Job -Wait
\ No newline at end of file
+npx concurrently `
+    -n "renderer,service" `
+    -p " {name} " `
+    -c "black.bgBlue,black.bgGreen" `
+    --kill-others `
+    "cd renderer && npm run serve" `
+    "cd service && npm run serve"
\ No newline at end of file
diff --git a/dev.sh b/dev.sh
index 6d81019..8570d0a 100755
--- a/dev.sh
+++ b/dev.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 
-# 定义颜色变量（使用 -e 选项的 echo 时）
-PINK=$'\033[33m'
-GREEN=$'\033[32m'
-NC=$'\033[0m'
-
-(cd renderer && npm run serve | while read -r line; do echo -e "${PINK}[renderer]${NC} $line"; done) &
-
-(cd service && npm run serve | while read -r line; do echo -e "${GREEN}[service]${NC} $line"; done) &
-
-wait
\ No newline at end of file
+npx concurrently \
+    -n "renderer,service" \
+    -p " {name} " \
+    -c "black.bgBlue,black.bgGreen" \
+    --kill-others \
+    "cd renderer && npm run serve" \
+    "cd service && npm run serve"
\ No newline at end of file