mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-12-03 02:42:19 +08:00
feat: fix a portion of get path
This commit is contained in:
parent
64d6b04320
commit
6b83d8b1d1
@ -6,16 +6,6 @@
|
|||||||
"build": { "dockerfile": "Dockerfile" },
|
"build": { "dockerfile": "Dockerfile" },
|
||||||
// Replace with uncommented line below to build your own local copy of the image
|
// Replace with uncommented line below to build your own local copy of the image
|
||||||
// "dockerFile": "../docker/Dockerfile-dev",
|
// "dockerFile": "../docker/Dockerfile-dev",
|
||||||
"containerEnv": {
|
|
||||||
// Uncomment to overwrite devcontainer .kube/config and .minikube certs with the localhost versions
|
|
||||||
// each time the devcontainer starts, if the respective .kube-localhost/config and .minikube-localhost
|
|
||||||
// folders respectively are bind mounted to the devcontainer.
|
|
||||||
// "SYNC_LOCALHOST_KUBECONFIG": "true"
|
|
||||||
|
|
||||||
// Uncomment to disable docker-in-docker and automatically proxy default /var/run/docker.sock to
|
|
||||||
// the localhost bind-mount /var/run/docker-host.sock.
|
|
||||||
// "BIND_LOCALHOST_DOCKER": "true"
|
|
||||||
},
|
|
||||||
"remoteEnv": {
|
"remoteEnv": {
|
||||||
"GO111MODULE": "on",
|
"GO111MODULE": "on",
|
||||||
"GOPROXY": "https://goproxy.cn",
|
"GOPROXY": "https://goproxy.cn",
|
||||||
|
|||||||
11
assets/colors.md
Normal file
11
assets/colors.md
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# Official Colors
|
||||||
|
|
||||||
|
The openim logo has an official blue color. When reproducing the logo, please use the official color, when possible.
|
||||||
|
|
||||||
|
## Pantone
|
||||||
|
|
||||||
|
When possible, the Pantone color is preferred for print material. The official Pantone color is *285C*.
|
||||||
|
|
||||||
|
## RGB
|
||||||
|
|
||||||
|
When used digitally, the official RGB color code is *#326CE5*.
|
||||||
@ -24,6 +24,7 @@ import (
|
|||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
|
"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed version
|
//go:embed version
|
||||||
@ -37,19 +38,30 @@ const (
|
|||||||
|
|
||||||
// return absolude path join ../config/, this is k8s container config path.
|
// return absolude path join ../config/, this is k8s container config path.
|
||||||
func GetDefaultConfigPath() string {
|
func GetDefaultConfigPath() string {
|
||||||
b, err := filepath.Abs(os.Args[0])
|
executablePath, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("filepath.Abs error,err=", err)
|
fmt.Println("GetDefaultConfigPath error:", err.Error())
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
return filepath.Join(filepath.Dir(b), "../config/")
|
|
||||||
|
configPath, err := genutil.OutDir(filepath.Join(filepath.Dir(executablePath), "../config/"))
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "failed to get output directory: %v\n", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
return configPath
|
||||||
}
|
}
|
||||||
|
|
||||||
// getProjectRoot returns the absolute path of the project root directory.
|
// getProjectRoot returns the absolute path of the project root directory.
|
||||||
func GetProjectRoot() string {
|
func GetProjectRoot() string {
|
||||||
b, _ := filepath.Abs(os.Args[0])
|
executablePath, _ := os.Executable()
|
||||||
|
|
||||||
return filepath.Join(filepath.Dir(b), "../../../../..")
|
projectRoot, err := genutil.OutDir(filepath.Join(filepath.Dir(executablePath), "../../../../.."))
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "failed to get output directory: %v\n", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
return projectRoot
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options {
|
func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options {
|
||||||
|
|||||||
40
pkg/util/flag/flag.go
Normal file
40
pkg/util/flag/flag.go
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
package flag
|
||||||
|
|
||||||
|
import (
|
||||||
|
goFlag "flag"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/spf13/pflag"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WordSepNormalizeFunc changes all flags that contain "_" separators.
|
||||||
|
func WordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
|
||||||
|
if strings.Contains(name, "_") {
|
||||||
|
return pflag.NormalizedName(strings.ReplaceAll(name, "_", "-"))
|
||||||
|
}
|
||||||
|
return pflag.NormalizedName(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WarnWordSepNormalizeFunc changes and warns for flags that contain "_" separators.
|
||||||
|
func WarnWordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
|
||||||
|
if strings.Contains(name, "_") {
|
||||||
|
normalizedName := strings.ReplaceAll(name, "_", "-")
|
||||||
|
log.Printf("WARNING: flag %s has been deprecated and will be removed in a future version. Use %s instead.", name, normalizedName)
|
||||||
|
return pflag.NormalizedName(normalizedName)
|
||||||
|
}
|
||||||
|
return pflag.NormalizedName(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// InitFlags normalizes, parses, then logs the command line flags.
|
||||||
|
func InitFlags() {
|
||||||
|
pflag.CommandLine.SetNormalizeFunc(WordSepNormalizeFunc)
|
||||||
|
pflag.CommandLine.AddGoFlagSet(goFlag.CommandLine)
|
||||||
|
}
|
||||||
|
|
||||||
|
// PrintFlags logs the flags in the flagset.
|
||||||
|
func PrintFlags(flags *pflag.FlagSet) {
|
||||||
|
flags.VisitAll(func(flag *pflag.Flag) {
|
||||||
|
log.Printf("FLAG: --%s=%q", flag.Name, flag.Value)
|
||||||
|
})
|
||||||
|
}
|
||||||
27
pkg/util/genutil/genutil.go
Normal file
27
pkg/util/genutil/genutil.go
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
package genutil
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
)
|
||||||
|
|
||||||
|
// OutDir creates the absolute path name from path and checks path exists.
|
||||||
|
// Returns absolute path including trailing '/' or error if path does not exist.
|
||||||
|
func OutDir(path string) (string, error) {
|
||||||
|
outDir, err := filepath.Abs(path)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
stat, err := os.Stat(outDir)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !stat.IsDir() {
|
||||||
|
return "", fmt.Errorf("output directory %s is not a directory", outDir)
|
||||||
|
}
|
||||||
|
outDir += "/"
|
||||||
|
return outDir, nil
|
||||||
|
}
|
||||||
26
pkg/util/genutil/genutil_test.go
Normal file
26
pkg/util/genutil/genutil_test.go
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
package genutil
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestValidDir(t *testing.T) {
|
||||||
|
_, err := OutDir("./")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestInvalidDir(t *testing.T) {
|
||||||
|
_, err := OutDir("./nondir")
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected an error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNotDir(t *testing.T) {
|
||||||
|
_, err := OutDir("./genutils_test.go")
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected an error")
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user