mirror of
https://github.com/yangjian102621/geekai.git
synced 2025-11-08 02:03:42 +08:00
resolve conflicts
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Listen = "0.0.0.0:5678"
|
||||
ProxyURL = ""
|
||||
MysqlDns = "root:12345678@tcp(geekai-mysql:3306)/geekai?charset=utf8mb4&collation=utf8mb4_unicode_ci&parseTime=True&loc=Local"
|
||||
MysqlDns = "root:AwkYTv00xU9n@tcp(geekai-mysql:3306)/geekai_plus?charset=utf8mb4&collation=utf8mb4_unicode_ci&parseTime=True&loc=Local"
|
||||
StaticDir = "./static"
|
||||
StaticUrl = "/static"
|
||||
TikaHost = "http://tika:9998"
|
||||
@@ -16,7 +16,7 @@ TikaHost = "http://tika:9998"
|
||||
[Redis]
|
||||
Host = "geekai-redis"
|
||||
Port = 6379
|
||||
Password = "12345678"
|
||||
Password = "AwkYTv00xU9n"
|
||||
DB = 0
|
||||
|
||||
[ApiConfig]
|
||||
@@ -109,4 +109,4 @@ TikaHost = "http://tika:9998"
|
||||
AppId = "" # 商户ID
|
||||
PrivateKey = "" # 商户私钥
|
||||
ApiURL = "https://pay.geekai.cn"
|
||||
Methods = ["alipay", "wxpay", "qqpay", "jdpay", "douyin", "paypal"] # 支持的支付方式
|
||||
Methods = ["alipay", "wxpay", "qqpay", "jdpay", "douyin", "paypal"] # 支持的支付方式
|
||||
|
||||
Reference in New Issue
Block a user