lumberjack改造前

EdgeAPI/internal/clickhouse/client.go

@@ -2,6 +2,7 @@ package clickhouse
 
 import (
 	"context"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -20,10 +21,18 @@ type Client struct {
 // NewClient 使用共享配置创建客户端
 func NewClient() *Client {
 	cfg := SharedConfig()
+	transport := &http.Transport{}
+	if cfg != nil && strings.EqualFold(cfg.Scheme, "https") {
+		transport.TLSClientConfig = &tls.Config{
+			InsecureSkipVerify: cfg.TLSSkipVerify,
+			ServerName:         cfg.TLSServerName,
+		}
+	}
 	return &Client{
 		cfg: cfg,
 		httpCli: &http.Client{
-			Timeout: 30 * time.Second,
+			Timeout:   30 * time.Second,
+			Transport: transport,
 		},
 	}
 }
@@ -95,12 +104,16 @@ func (c *Client) QueryRow(ctx context.Context, query string, dest interface{}) e
 }
 
 func (c *Client) buildURL(query string) string {
-	rawURL := fmt.Sprintf("http://%s:%d/?query=%s&database=%s",
-		c.cfg.Host, c.cfg.Port, url.QueryEscape(query), url.QueryEscape(c.cfg.Database))
+	scheme := "http"
+	if c.cfg != nil && strings.EqualFold(c.cfg.Scheme, "https") {
+		scheme = "https"
+	}
+	rawURL := fmt.Sprintf("%s://%s:%d/?query=%s&database=%s",
+		scheme, c.cfg.Host, c.cfg.Port, url.QueryEscape(query), url.QueryEscape(c.cfg.Database))
 	return rawURL
 }
 
-// decodeRows 将 JSONEachRow 流解析到 slice；元素类型须为 *struct 或 *map[string]interface{}
+// decodeRows 将 JSONEachRow 流解析到 slice；元素类型须为 *struct 或 *[]map[string]interface{}
 func decodeRows(dec *json.Decoder, dest interface{}) error {
 	// dest 应为 *[]*SomeStruct 或 *[]map[string]interface{}
 	switch d := dest.(type) {

EdgeAPI/internal/clickhouse/config.go

@@ -7,17 +7,22 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"os"
 	"strconv"
+	"strings"
 	"sync"
 )
 
 const (
-	envHost     = "CLICKHOUSE_HOST"
-	envPort     = "CLICKHOUSE_PORT"
-	envUser     = "CLICKHOUSE_USER"
-	envPassword = "CLICKHOUSE_PASSWORD"
-	envDatabase = "CLICKHOUSE_DATABASE"
-	defaultPort = 8123
-	defaultDB   = "default"
+	envHost          = "CLICKHOUSE_HOST"
+	envPort          = "CLICKHOUSE_PORT"
+	envUser          = "CLICKHOUSE_USER"
+	envPassword      = "CLICKHOUSE_PASSWORD"
+	envDatabase      = "CLICKHOUSE_DATABASE"
+	envScheme        = "CLICKHOUSE_SCHEME"
+	envTLSSkipVerify = "CLICKHOUSE_TLS_SKIP_VERIFY"
+	envTLSServerName = "CLICKHOUSE_TLS_SERVER_NAME"
+	defaultPort      = 8123
+	defaultDB        = "default"
+	defaultScheme    = "http"
 )
 
 var (
@@ -28,11 +33,14 @@ var (
 
 // Config ClickHouse 连接配置（仅查询，不从代码写库）
 type Config struct {
-	Host     string
-	Port     int
-	User     string
-	Password string
-	Database string
+	Host          string
+	Port          int
+	User          string
+	Password      string
+	Database      string
+	Scheme        string
+	TLSSkipVerify bool
+	TLSServerName string
 }
 
 // SharedConfig 返回全局配置（优先从后台 DB 读取，其次 api.yaml，最后环境变量）
@@ -54,7 +62,7 @@ func ResetSharedConfig() {
 }
 
 func loadConfig() *Config {
-	cfg := &Config{Port: defaultPort, Database: defaultDB}
+	cfg := &Config{Port: defaultPort, Database: defaultDB, Scheme: defaultScheme}
 	// 1) 优先从后台页面配置（DB）读取
 	if models.SharedSysSettingDAO != nil {
 		if dbCfg, err := models.SharedSysSettingDAO.ReadClickHouseConfig(nil); err == nil && dbCfg != nil && dbCfg.Host != "" {
@@ -63,6 +71,9 @@ func loadConfig() *Config {
 			cfg.User = dbCfg.User
 			cfg.Password = dbCfg.Password
 			cfg.Database = dbCfg.Database
+			cfg.Scheme = normalizeScheme(dbCfg.Scheme)
+			cfg.TLSSkipVerify = dbCfg.TLSSkipVerify
+			cfg.TLSServerName = dbCfg.TLSServerName
 			if cfg.Port <= 0 {
 				cfg.Port = defaultPort
 			}
@@ -81,6 +92,9 @@ func loadConfig() *Config {
 		cfg.User = ch.User
 		cfg.Password = ch.Password
 		cfg.Database = ch.Database
+		cfg.Scheme = normalizeScheme(ch.Scheme)
+		cfg.TLSSkipVerify = ch.TLSSkipVerify
+		cfg.TLSServerName = ch.TLSServerName
 		if cfg.Port <= 0 {
 			cfg.Port = defaultPort
 		}
@@ -97,14 +111,29 @@ func loadConfig() *Config {
 	if cfg.Database == "" {
 		cfg.Database = defaultDB
 	}
+	cfg.Scheme = normalizeScheme(os.Getenv(envScheme))
+	cfg.TLSServerName = os.Getenv(envTLSServerName)
 	if p := os.Getenv(envPort); p != "" {
 		if v, err := strconv.Atoi(p); err == nil {
 			cfg.Port = v
 		}
 	}
+	if v := os.Getenv(envTLSSkipVerify); v != "" {
+		if b, err := strconv.ParseBool(v); err == nil {
+			cfg.TLSSkipVerify = b
+		}
+	}
 	return cfg
 }
 
+func normalizeScheme(scheme string) string {
+	s := strings.ToLower(strings.TrimSpace(scheme))
+	if s == "https" {
+		return "https"
+	}
+	return defaultScheme
+}
+
 // IsConfigured 是否已配置（Host 非空即视为启用 ClickHouse 查询）
 func (c *Config) IsConfigured() bool {
 	return c != nil && c.Host != ""