file tree update

Author: raccoon-mh

.gitignore

@@ -34,7 +34,6 @@ api/!.yarn/sdks
 api/!.yarn/versions
 
 
-
 # front
 
 ## env
@@ -68,14 +67,15 @@ front/.idea
 
 # bin
 bin/mc-web-console-api
+bin/mc-web-console-api.pid
+bin/mc-web-console-api.log
 bin/.env
 
+# conf
+conf/api.yaml
+conf/selfiamauthsetting.yaml
+conf/selfiamuser.dat
+conf/serverinfo
+
+# scripts
 scripts/.env
-api/conf/api.yaml
-bin/mc-web-console-api.log
-bin/conf/api.yaml
-api/conf/serverinfo
-api/conf/cmiguser.dat
-api/conf/cmigauthsetting.yaml
-api/conf/selfiamuser.dat
-api/conf/selfiamauthsetting.yaml

api/handler/http-util.go

@@ -69,7 +69,7 @@ var (
 func init() {
 	viper.SetConfigName("api")
 	viper.SetConfigType("yaml")
-	viper.AddConfigPath("conf")
+	viper.AddConfigPath("../conf")
 
 	if err := viper.ReadInConfig(); err != nil {
 		panic(fmt.Errorf("fatal error reading actions/conf/api.yaml file: %s", err))

api/handler/self/auth.go

@@ -40,8 +40,8 @@ var (
 	CmigUser        *User
 	cmigAuthSetting CmigAuthSetting
 	encryptionKey   []byte
-	datfilename     = "conf/selfiamuser.dat"
-	conffilename    = "conf/selfiamauthsetting.yaml"
+	datfilename     = "../conf/selfiamuser.dat"
+	conffilename    = "../conf/selfiamauthsetting.yaml"
 )
 
 func init() {

api/handler/self/menu.go

@@ -55,7 +55,7 @@ func buildMenuTree(menus Menus, parentID string) Menus {
 }
 
 func createMenuResource() error {
-	yamlFile := "./conf/selfiammenu.yaml"
+	yamlFile := "../conf/selfiammenu.yaml"
 
 	data, err := os.ReadFile(yamlFile)
 	if err != nil {

bin/.env.sample

@@ -0,0 +1,16 @@
+API_ADDR=0.0.0.0
+API_PORT=3000
+
+DATABASE_USER=DATABASE_USER  # Please CHANGE ME (REQUIRE)
+DATABASE_PASS=DATABASE_PASS  # Please CHANGE ME (REQUIRE)
+DATABASE_HOST=DATABASE_HOST  # Please CHANGE ME (REQUIRE)
+DATABASE=DATABASE  # Please CHANGE ME (REQUIRE)
+DEV_DATABASE_URL=postgres://${DATABASE_USER}:${DATABASE_PASS}@${DATABASE_HOST}:5432/${DATABASE}
+
+PROD_DATABASE_USER=DATABASE_USER  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE_PASS=DATABASE_PASS  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE_HOST=DATABASE_HOST  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE=DATABASE  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE_URL=postgres://${DATABASE_USER}:${DATABASE_PASS}@${DATABASE_HOST}:5432/${DATABASE}
+
+MCIAM_USE=true