fix: commit
Some checks failed
build quyun / Build (push) Failing after 1m26s

This commit is contained in:
2025-12-22 10:48:26 +08:00
parent 1aab961b8d
commit 885df8aabf
5 changed files with 99 additions and 14 deletions

View File

@@ -54,7 +54,7 @@ func Serve(cmd *cobra.Command, args []string) error {
goose.SetBaseFS(database.MigrationFS)
goose.SetTableName("migrations")
goose.AddNamedMigrationNoTxContext("20251219062732_river_job.go", RiverUp, RiverDown)
// goose.AddNamedMigrationNoTxContext("20251219062732_river_job.go", RiverUp, RiverDown)
return goose.RunContext(context.Background(), action, svc.DB, "migrations", args...)
})

View File

@@ -10,7 +10,7 @@ RechargeWechat = "13932043996"
Port = 9888
[Database]
Host = "host.local"
Host = "postgres"
Database = "quyun"
Password = "xixi0202"
@@ -30,9 +30,9 @@ DB = 0
[Ali]
AccessKeyId = "LTAI5t86SjiP9zRd3q2w7jQN"
AccessKeySecret = "hV7spvJuWh8w0EEIXj8NFi2uBlF4aS"
Bucket ="rogee-bj"
Host ="https://assets.jdwan.com"
Region ="cn-beijing"
Bucket = "rogee-bj"
Host = "https://assets.jdwan.com"
Region = "cn-beijing"
[WeChat]
AppID = "wx47649361b6eba174"
@@ -42,12 +42,12 @@ EncodingAesKey = "OlgPgMvsl92zy5oErtEzRcziRT2txoN3jgEHV6RQZMY"
DevMode = false
[WeChat.Pay]
NotifyURL="https://mp.jdwan.com/v1/pay/callback/wechat"
NotifyURL = "https://mp.jdwan.com/v1/pay/callback/wechat"
MchID = "1702644947"
SerialNo = "4563EC584A35BC84FB27AA4100C934C9A91D59CA"
MechName = "佳芃(北京)企业管理咨询有限公司"
ApiV3Key="5UBDkxVDY44AKafkqN6YgYxgtkXP6Mw6"
PrivateKey="""-----BEGIN PRIVATE KEY-----
ApiV3Key = "5UBDkxVDY44AKafkqN6YgYxgtkXP6Mw6"
PrivateKey = """-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC+GjWdwRorgQXw
Z8ouZeW8UsUgjiSUPKLJHGOZQESa09xmzm+DVZWNCPEHJvz1bDmSNXVsQUWRE/+y
MwSfe+faq0d4BZiw1ueFbRyj4Vw/x7B2vY0i8yo0VyTnWdC6QZRc+V+dbuPJM1Ok

View File

@@ -13,7 +13,8 @@ Port = 8088
[Database]
Host = "10.1.1.2"
Port = 5433
Database = "quyun"
# Database = "quyun"
Database = "q1"
Password = "xixi0202"
[JWT]

View File

@@ -90,7 +90,7 @@ func (m *Config) checkDefault() {
}
if m.TimeZone == "" {
m.TimeZone = "Asia/Shanghai"
// m.TimeZone = "Asia/Shanghai"
}
if m.Port == 0 {
@@ -104,9 +104,13 @@ func (m *Config) checkDefault() {
func (m *Config) EmptyDsn() string {
// 基本 DSN
dsnTpl := "host=%s user=%s password=%s port=%d dbname=%s sslmode=%s TimeZone=%s"
// dsnTpl := "host=%s user=%s password=%s port=%d dbname=%s sslmode=%s TimeZone=%s"
// m.checkDefault()
// base := fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Port, m.Database, m.SslMode, m.TimeZone)
dsnTpl := "host=%s user=%s password=%s port=%d dbname=%s sslmode=%s"
m.checkDefault()
base := fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Port, m.Database, m.SslMode, m.TimeZone)
base := fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Port, m.Database, m.SslMode)
// 附加可选参数
extras := ""
if m.UseSearchPath && m.Schema != "" {
@@ -121,9 +125,9 @@ func (m *Config) EmptyDsn() string {
// DSN connection dsn
func (m *Config) DSN() string {
// 基本 DSN
dsnTpl := "host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s"
dsnTpl := "host=%s user=%s password=%s dbname=%s port=%d sslmode=%s"
m.checkDefault()
base := fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Database, m.Port, m.SslMode, m.TimeZone)
base := fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Database, m.Port, m.SslMode)
// 附加可选参数
extras := ""
if m.UseSearchPath && m.Schema != "" {