Merge pull request #24 from IRONICBo/fix/aggregation-config

feat: aggreate config.
Baihhh · Mar 13, 2024 · c434f8c · c434f8c
2 parents da0a873 + 5c5b8c0
commit c434f8c
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 1,123 deletions.
diff --git a/cmd/gopcomm/.env_temp b/cmd/gopcomm/.env_temp
@@ -21,6 +21,7 @@ GOP_ACCOUNT_ENDPOINT="0.0.0.0:8081"
 GOP_COMMUNITY_ENDPOINT="0.0.0.0:8080"
 
 # Database DSN
+GOP_COMMUNITY_DRIVER=
 GOP_COMMUNITY_DSN=
 
 # Qiniu Storage

diff --git a/cmd/gopcomm/community_yap.gox b/cmd/gopcomm/community_yap.gox
@@ -1,6 +1,7 @@
 import (
  "context"
  "fmt"
+ "flag"
  "io"
  "net/http"
  "net/url"
@@ -13,6 +14,7 @@ import (
  "github.com/goplus/community/internal/core"
  "github.com/goplus/community/translation"
  _ "github.com/joho/godotenv/autoload"
+ "github.com/joho/godotenv"
  gopaccountsdk "github.com/liuscraft/gop-casdoor-account-sdk"
  "github.com/qiniu/x/xlog"
  language "golang.org/x/text/language"
@@ -21,6 +23,8 @@ import (
 var (
  community *core.Community
  trans *translation.Engine
+ domain string
+ htmlUrl string
 )
 
 const (
@@ -31,8 +35,6 @@ const (
 )
 
 todo := context.TODO()
-endpoint := os.Getenv("GOP_COMMUNITY_ENDPOINT")
-domain := os.Getenv("GOP_COMMUNITY_DOMAIN")
 xLog := xlog.New("")
 
 // Modify / to /static
@@ -859,15 +861,23 @@ post "/api/article/like", ctx => {
  }
 }
 
-conf := &core.Config{}
-community, _ = core.New(todo, conf)
-core.CasdoorConfigInit()
-
 // 404
 handle "/", ctx => {
  ctx.yap "4xx", {}
 }
 
+configFile := ".env"
+flag.StringVar(&configFile, "config", ".env", "Path to the config file")
+flag.Parse()
+if err := godotenv.Load(configFile); err != nil {
+ xLog.Error(err)
+}
+
+conf := core.NewConfigFromEnv()
+community, _ = core.New(todo, conf)
+domain = conf.QiNiuConfig.Domain
+endpoint := conf.AppConfig.EndPoint
+
 xLog.Info "Started in endpoint: ", endpoint
 
 // 500