兼容配置文件读取路径

.gitignore

@@ -4,6 +4,7 @@ latest_log
 latest_binlog
 latest_filelog
 /config/*.yaml
+/config/*.pem
 .DS_Store
 /binlog
 /rdlucklog

config/rsa_private_key.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA0Gh3c2fki27yLKMUPUqZhDa0vGRp01ca5Rbpd6RoZURIA4Ti
-1k/zf2jW0tJ1OUnkBiBtcfZ4d+6gPr1kdsdpxSjlV1PQfzaMtZg0ZKiHTw4xhJ+P
-/XCzIPJaUKAwKqb8U0gsXfZVcF0OEwWAgNxLzMhPlTiSAWaRUOumOHNexSRzG9UR
-y+v/UIVkuDXFwzb1aly93S0Elp7cDPQA0FCLqiwofnNdPTJ1BiXa1OO8UFXuV16H
-w0JeYdl+GWUf8Q4uTKUesclnBkLgOUaXSJQqfNwqSBj39H4vRTBKX1eiqhCwt3/l
-wBEpWW8YHkfEssclh0x2xf0714e/H3BuwLwdWwIDAQABAoIBAQCyQvkRfKcvYOnC
-poc0We/v+D8l+ZnPTO1TUQLH9JfbLsmOQQcqG18C9zDxSVU9eGeTmf8jgJfQtgrZ
-P3SEaNOe8fkhdi6b8ZPv7E28X67FPzW55CXsuY5uuv3ngu1QPl8L+WsBwCeaoe3c
-9VLSZhxsAFaaI7Y3fn0Dw1z9YimI47ZSHra1xo9JM9EZybVYi8HaIoame9fs+TaK
-ulr5nDjuRqPFhvVGpa/+S0S75ArW4VKrWp97cQ3D1xw2Fz0jP3eHndCErTYhj8MB
-10AFCndNKEIrwMPN5M426TbBLJY0vcIPYg0v4lSzwwAhYnNNmxMmroRLnD22ohdf
-687g52vRAoGBAOy6iiJxqW1mLNDKtwANI2XJBnoHbh8lPR3ZYlNybLeR49dFC7Qw
-5pv//rMybvWNG8obacQ0GiLXmlaajXFrpL9K+7qkg4W1VvjCvUo/Qk7He/sLOiXW
-/HuAOKZOhuLBoOzbDjDBHYy+eXDjzgqCrHpnI0wZ8uLahSUeTNSSgiNjAoGBAOFf
-uLnIMeV5kaNssvz+2iZ2W3aEW90fgNz8gy3VwzEarEGo7nalcq9vODwFHQNlZuE5
-BdzYXWE8Fjn/yJLipPxGXzPvGyZP4qUKgN8Mek39RJqvV3Mgtt0WG6IZpo0E0by0
-TmThlI0xJzi4Px01ip6fdhlJJPPC+yFayLzqtIupAoGBAJf7DtIcPNUSgvUtIB31
-UWN4kyLnAEkYpEs0lA7U6H1WOXusRV5TAsrmqEOtvlUBWfUAcn/Xn2v9FYZCRUqq
-/CMf5csm8ZV3HbYpeFNhl5VyNuOuio9encxAPp5uzeRowYMvA8ZDRVBlvRu/9TkE
-Oe1/p8ak5i3EczSoZlUXFlvXAoGBANx5N80G+0jx1Hd7Lt4wslhOEMuwT+3Rk86b
-d/iu1XSEE19oU1/eGoNk2i5dEjTwTeSmVAXn4/HrRhMXFrAa6Cui7B9yGa0xGRc7
-XzbUjhEdYq+wOGx35GwD5KR/U19BB60C9m3Z/+jf3O6vz45TgngKpw21cGDGrcXD
-efzV3imBAoGAI3Md0ap1zmLVpM8NLCA9JxPPQiQAq0VmCGrEjeEk+sVn09lkESdb
-VDiu0VNGfWKsY+7hUC1qjBQ1ZCR4NFkwD6QwBsovrni6rK3f/4qRRmP8ORK9ASIi
-Kw8stl7KvZdCltTobaVPFA90s+zgUsr9W6Q+gUPv2I/rmFWqpbJRARc=
------END RSA PRIVATE KEY-----

config/rsa_public_key.pem

@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Gh3c2fki27yLKMUPUqZ
-hDa0vGRp01ca5Rbpd6RoZURIA4Ti1k/zf2jW0tJ1OUnkBiBtcfZ4d+6gPr1kdsdp
-xSjlV1PQfzaMtZg0ZKiHTw4xhJ+P/XCzIPJaUKAwKqb8U0gsXfZVcF0OEwWAgNxL
-zMhPlTiSAWaRUOumOHNexSRzG9URy+v/UIVkuDXFwzb1aly93S0Elp7cDPQA0FCL
-qiwofnNdPTJ1BiXa1OO8UFXuV16Hw0JeYdl+GWUf8Q4uTKUesclnBkLgOUaXSJQq
-fNwqSBj39H4vRTBKX1eiqhCwt3/lwBEpWW8YHkfEssclh0x2xf0714e/H3BuwLwd
-WwIDAQAB
------END PUBLIC KEY-----

global/global.go

@@ -29,19 +29,33 @@ var (
 	Re error             //redis错误
 )
 
-const ConfigFile = "config/config_debug.yaml"                           //本地（测试）环境下的配置文件地址
-const ProConfigFile = "/home/code/config/eta_bridge/config/config.yaml" //生产环境下的配置文件地址
+const ConfigFile = "config_debug.yaml"
+const ProConfigFile = "config.yaml"
+const DefaultFilePath = "config"
+const ConfigFilePath = "/home/code/config/eta_bridge/config" //生产环境下的配置文件地址
 
 func init() {
 	v := viper.New()
 
-	configFilePath := ConfigFile
-
-	//如果不存在该配置文件，那么应该是线上环境，那么去寻找线上配置文件的路径
-	if !utils.FileIsExist(configFilePath) {
-		configFilePath = ProConfigFile
-	}
+	configFilePath, _ := utils.ExistFiles(map[string][]string{
+		DefaultFilePath: {
+			ConfigFile,
+			ProConfigFile,
+		},
+		ConfigFilePath: {
+			ProConfigFile,
+		},
+	})
 
+	//configFilePath := ConfigFile
+	////如果不存在该配置文件，那么应该是线上环境，那么去寻找线上配置文件的路径
+	//if !utils.FileIsExist(configFilePath) {
+	//	configFilePath = ProConfigFile
+	//}
+	////如果该配置文件，那么应该是线上环境，那么去寻找线上配置文件的路径
+	//if !utils.FileIsExist(configFilePath) {
+	//	configFilePath = ConfigFilePath
+	//}
 	fmt.Println("configFilePath->", configFilePath)
 
 	//设置配置文件

utils/common.go

@@ -250,6 +250,29 @@ func FileIsExist(filePath string) bool {
 	_, err := os.Stat(filePath)
 	return err == nil || os.IsExist(err)
 }
+func ExistFiles(configPathMap map[string][]string) (FullFileName string, err error) {
+	for filePath, fileNames := range configPathMap {
+		if FullFileName != "" {
+			return
+		}
+		files, pathErr := os.ReadDir(filePath)
+		if pathErr != nil {
+			continue
+		}
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+			for _, fileName := range fileNames {
+				if file.Name() == fileName {
+					FullFileName = fmt.Sprintf("%s/%s", filePath, file.Name())
+					break
+				}
+			}
+		}
+	}
+	return
+}
 
 // GetImgExt 获取图片扩展名
 func GetImgExt(file string) (ext string, err error) {
@@ -1090,4 +1113,4 @@ func InArrayByInt(idStrList []int, searchId int) (has bool) {
 		}
 	}
 	return
-}
+}