From 874cbeca785404e129a13e6bfdf47a2900697a76 Mon Sep 17 00:00:00 2001
From: zhouyonggao <1971162852@qq.com>
Date: Tue, 25 Nov 2025 11:06:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(server):=20=E4=BC=98=E5=8C=96=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=90=AF=E5=8A=A8=E8=84=9A=E6=9C=AC=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改run_server.sh脚本以支持环境变量和构建选项
移除mysql.go中无效的默认连接字符串并修复代码格式
---
 scripts/run_server.sh            |  14 +++++++++++++-
 server/bin/marketing-data-server | Bin 12136242 -> 12136242 bytes
 server/internal/db/mysql.go      |  18 ++++++++----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/scripts/run_server.sh b/scripts/run_server.sh
index ec9e755..921cb67 100644
--- a/scripts/run_server.sh
+++ b/scripts/run_server.sh
@@ -1,5 +1,17 @@
 #!/usr/bin/env bash
 set -e
 cd "$(dirname "$0")/.."/server
+set -a
+[ -f .env.local ] && source .env.local
+set +a
+if [ "${SKIP_YMT:-0}" = "1" ]; then
+  unset YMT_DB_USER YMT_DB_PASSWORD YMT_DB_HOST YMT_DB_PORT YMT_DB_NAME
+fi
 go mod tidy
-go run ./cmd/server
+if [ "${BUILD:-0}" = "1" ]; then
+  mkdir -p bin
+  go build -o bin/marketing-data-server ./cmd/server
+  PORT=${PORT:-8077} ./bin/marketing-data-server
+else
+  go run ./cmd/server
+fi
diff --git a/server/bin/marketing-data-server b/server/bin/marketing-data-server
index 565a89c03b7955da89cd1a1dc4cc91531e759479..e411369a91b8633da775cb4dbd43e1399188cfdf 100755
GIT binary patch
delta 1116
zcmbWy?N7`B0KoC3jvhRmkjHdFou|6)es^6Z>PkgPUF9lIb-(L$m(*2`E_n(U$}^Yb
zDN#ut3fIhLm@qb8*s_?}c;SuNVq-Jr>tFEV^YZ)R+w=aDqz5<N_)4w4678!lVe!i`
z$#oV>O>OUIU%4d9s7tCUb3|1pX_gzy^BrYHHoXv@W;U-cSBd(n3Tw8?U@Xkg=^WuU
zU9!a?W~L}Cb|F5o*pzA$OTtUEit>zj(O^syjCNg4<c8{mjdh~bDM~#s44&|U1j8``
z-td7h{4f%uFdAd<uOAD4jKg?LKmaCU5+-8`reYcbF&#mWVFrRR6SFWIAqa&Wb1)b4
zFdqvLhHxkl0VPxrpoRvK&>{-ah`~a)D2-j<FITIzCap>+6pTuRLK~qnD<jQXlTs03
zHfl^!MNwvRghCUk5nO%2u|Zy%Xr;pWHaHfGuo!WOhYkry#1bSS87WwbWk^LDmLnZ2
zkbz9-k%esJU?mL5MIQ383ahaOYq1UmD1;FrOelgG>ro5~tSG^T_P4>MZU6D@;yc<|
z@T3$QQHFBZP=QKRVH51wj4h~!12x!+T5Q91?7&X!LLGKv5B9=|dhEk~96$paaS(@a
z7)Njv$8a1ca1t&w;S`#28Z9`3vp9$IxPVq%L>n&QGTPCBPFz73uA&>)a2+>r6Fum~
zE!=h&Jh`L)8P}0gI?(Lr%v0NcxW3k(C~5j6zVK~pkfdj3e94hWy&t^xsOxTQk%cXb
z8JsQ;^eYat9qP^V`!;qc_xi`D0iEqb_uURziy=MxYIA=>tEZ1V|M|lJwISDTdStgg
za~-^PuOlSX?H}DIE0kGR4gS_PY5Ly{?;eu>F*y5`cZ+`MAN%AD2;V<GQ+K%ar~5t}
F`wJ-6*J=O&

delta 1116
zcmbWy*;C8`0KoB)4id7C618hxInr+JZoihub{|q3NnwxQ?%M4@VO7Wx$`KKY9F+)#
z6gD#&*9_x<hn|cY8JbZuW*A<~c*xhk;NkQ5efV~M9Q5c!$9r$z;_B<tLrKfhdLQ@1
zIj06mx`w=iJu(d?vHEz8;0RMB8n#%nV-#YhH8e?;C8UO=JM0CeN>z?CD_KmB4=vIq
zILgF~M1{ktS{ZA%q!fwyp<C5?`Z7z1PS~Y$CKqOGGwba66{2sY=sOB-7!7xLz!P2=
zgR$_&IQU>ZCSW4|^^+jMWK6+SOoJc%F&zPzftd(I5TuY{7UY<XIhc!in2%sAz(Op-
zVuWA`LZN^XVF-r`YG@Dv0g=#RDVDiJ->48taG1s_Xau!MR7EIEYMa8O5N#1wv)UGE
zwFov-q+kw<Fl$udb=~qPsk>6ER95!Mqp%z+5RH}4AqKICLp&0Yh$JK<1*uqtG^|EC
zGN4B$)?h8NunyT+j~wJ;12$q43^2k3GelTmg$<iwhXZ-YM?q_!ys+gzzU%nbRvKRy
zVhgrn8;Vej?bv~xaAFrqP>M3_#vbfNIrd>c4&Wdva0rKS1eK`5Q5?f@oIo{B;uLCd
z8fQ?8vp9$Is6#z2;367u372sNSJ8+jG~*gta2+?$ikrBF+h{{O?%*!&p#%5Pi7q_A
zLznUOBmM8_FP@P*yo#HTyc%rJUOO=4uPyG$^||yXu)tms|D@5F=ie$%{?g?4b=0~A
zL76Y4>IpxDrW415`pZ8UJ!LKJovlBgy2@mYZif2J4W(_%2OGpV)o^cP_{iILr-lMt
zZ*uC}W*SCZ5^cB4BwLu;Yke8@?b({oKPA6LhM(^l_&%dXcCuNTR^@)U`ewgN-_ZT3
F_Ai3c+Q<L^

diff --git a/server/internal/db/mysql.go b/server/internal/db/mysql.go
index 54f5379..99d1e2d 100644
--- a/server/internal/db/mysql.go
+++ b/server/internal/db/mysql.go
@@ -1,17 +1,15 @@
 package db
 
 import (
-    "database/sql"
-    _ "github.com/go-sql-driver/mysql"
+	"database/sql"
+
+	_ "github.com/go-sql-driver/mysql"
 )
 
 func ConnectMySQL(dsn string) (*sql.DB, error) {
-    if dsn == "" {
-        return sql.Open("mysql", "invalid:invalid@tcp(localhost:3306)/invalid")
-    }
-    db, err := sql.Open("mysql", dsn)
-    if err != nil {
-        return nil, err
-    }
-    return db, nil
+	db, err := sql.Open("mysql", dsn)
+	if err != nil {
+		return nil, err
+	}
+	return db, nil
 }