diff --git a/build.bat b/build.bat index b2bb40f..918167c 100644 --- a/build.bat +++ b/build.bat @@ -3,5 +3,5 @@ REM 构建脚本:交叉编译 Linux amd64 二进制 set GOOS=linux set GOARCH=amd64 set CGO_ENABLED=0 -go build -o app . -echo 构建完成: app.exe +go build -o douya . +echo 构建完成: douya.exe diff --git a/config.yaml b/config.yaml index 832dcf5..34d2934 100644 --- a/config.yaml +++ b/config.yaml @@ -110,7 +110,7 @@ ai: # ========== 企业微信 Webhook ========== wechat_webhook: enabled: true - url: "" # 企业微信群机器人 Webhook URL + url: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=71110fd5-9f51-4695-88dc-85ca34385d66" # 示例: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx # ========== CORS 跨域 ========== diff --git a/app b/douya similarity index 84% rename from app rename to douya index e491cee..473591d 100644 Binary files a/app and b/douya differ diff --git a/internal/handler/customer.go b/internal/handler/customer.go index 355810a..862d3de 100644 --- a/internal/handler/customer.go +++ b/internal/handler/customer.go @@ -8,6 +8,7 @@ import ( "net/http" "time" + "gotest/internal/config" "gotest/internal/model" "github.com/gin-gonic/gin" @@ -16,12 +17,13 @@ import ( // CustomerHandler 客户信息收集处理器 type CustomerHandler struct { - db *gorm.DB + db *gorm.DB + cfg *config.Config } // NewCustomerHandler 创建客户信息收集处理器 -func NewCustomerHandler(db *gorm.DB) *CustomerHandler { - return &CustomerHandler{db: db} +func NewCustomerHandler(db *gorm.DB, cfg *config.Config) *CustomerHandler { + return &CustomerHandler{db: db, cfg: cfg} } // CustomerRequest 客户信息请求 @@ -63,12 +65,17 @@ func (h *CustomerHandler) Submit(c *gin.Context) { }) } -// getWebhookURL 从数据库获取webhook URL +// getWebhookURL 从数据库获取webhook URL,没有则回退到config.yaml func (h *CustomerHandler) getWebhookURL() string { + // 优先从数据库读取 var cfg model.Config if err := h.db.Where("`key` = ?", "wechat_webhook_url").First(&cfg).Error; err == nil && cfg.Value != "" { return cfg.Value } + // 回退到 config.yaml + if h.cfg.WechatWebhook.URL != "" { + return h.cfg.WechatWebhook.URL + } return "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=71110fd5-9f51-4695-88dc-85ca34385d66" } diff --git a/main.go b/main.go index 4ac1a68..d0c02e5 100644 --- a/main.go +++ b/main.go @@ -89,7 +89,7 @@ func main() { appHandler := handler.NewAppHandler(appService) musicHandler := handler.NewMusicHandler(musicService) dashboardHandler := handler.NewDashboardHandler(db.DB) - customerHandler := handler.NewCustomerHandler(db.DB) + customerHandler := handler.NewCustomerHandler(db.DB, cfg) accessLogHandler := handler.NewAccessLogHandler(db.DB) configHandler := handler.NewConfigHandler(db.DB)