From 9db01451e2a8e7ca02d190a8bc726f9a48fa499d Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Sun, 24 Dec 2023 11:59:24 +0800 Subject: [PATCH 1/7] add --- api/consts/consts.go | 2 ++ app/mix/cmd/main.go | 3 +++ etc/mix/mix-prod.yaml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/consts/consts.go b/api/consts/consts.go index 6b6c2e1b..28c9fceb 100644 --- a/api/consts/consts.go +++ b/api/consts/consts.go @@ -64,6 +64,8 @@ const PackageRootPath = "/app/wishpal-ironfan" const MainConfigPath = PackageRootPath + "/etc/mix/mix-test.yaml" +const ProductionConfigPath = PackageRootPath + "/etc/mix/mix-prod.yaml" + const LocalConfigPath = "/Users/erwin/wishpal/wishpal-ironfan/etc/mix/mix-local.yaml" const ReservedUserIdRegexesConfig = PackageRootPath + "/etc/mix/resource/reg_reserved_user_id_config.xml" diff --git a/app/mix/cmd/main.go b/app/mix/cmd/main.go index 580e46bc..5c9dd438 100644 --- a/app/mix/cmd/main.go +++ b/app/mix/cmd/main.go @@ -28,6 +28,9 @@ func main() { // 加载配置 // 1.默认配置 configPath := consts.MainConfigPath + if os.Getenv("PROJECT_ENV") == "production" { + configPath = consts.ProductionConfigPath + } cfg := new(conf.ConfigSt) err := configcenter.LoadConfig(configPath, cfg) if err != nil { diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml index 70687ccf..209502cf 100644 --- a/etc/mix/mix-prod.yaml +++ b/etc/mix/mix-prod.yaml @@ -50,7 +50,7 @@ alipay: apollo: app_id: "wishpal_live_service" cluster: "dev" - ip: "http://localhost:8080" + ip: "http://172.16.0.174:8080" namespace_name: "application,tag,account_init,platform,support_wx_id,version" secret: "" is_back_up_config: true From 8e6b8d65ac754a3e4028f7702523c2ecd78515d6 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Sun, 24 Dec 2023 12:33:21 +0800 Subject: [PATCH 2/7] add --- app/mix/cmd/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/mix/cmd/main.go b/app/mix/cmd/main.go index 5c9dd438..c2bba31b 100644 --- a/app/mix/cmd/main.go +++ b/app/mix/cmd/main.go @@ -27,10 +27,10 @@ import ( func main() { // 加载配置 // 1.默认配置 - configPath := consts.MainConfigPath - if os.Getenv("PROJECT_ENV") == "production" { - configPath = consts.ProductionConfigPath - } + configPath := consts.ProductionConfigPath + //if os.Getenv("PROJECT_ENV") == "production" { + // configPath = consts.ProductionConfigPath + //} cfg := new(conf.ConfigSt) err := configcenter.LoadConfig(configPath, cfg) if err != nil { From 00ce752b6c4f2e9143688b95aa6720709d9a3207 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Sun, 24 Dec 2023 12:44:04 +0800 Subject: [PATCH 3/7] production path --- app/mix/cmd/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/mix/cmd/main.go b/app/mix/cmd/main.go index c2bba31b..a0e5af37 100644 --- a/app/mix/cmd/main.go +++ b/app/mix/cmd/main.go @@ -28,6 +28,7 @@ func main() { // 加载配置 // 1.默认配置 configPath := consts.ProductionConfigPath + //if os.Getenv("PROJECT_ENV") == "production" { // configPath = consts.ProductionConfigPath //} From 08e470e08c02841949b44deecd08429d9f305853 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Sun, 24 Dec 2023 12:48:26 +0800 Subject: [PATCH 4/7] fix password --- etc/mix/mix-prod.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml index 209502cf..8047a795 100644 --- a/etc/mix/mix-prod.yaml +++ b/etc/mix/mix-prod.yaml @@ -12,9 +12,9 @@ app: port: 9999 mix_mongo: - uri: "mongodb://root:Tbuy!vj@24vq@dds-bp1628b447c242e41.mongodb.rds.aliyuncs.com:3717,dds-bp1628b447c242e42.mongodb.rds.aliyuncs.com:3717/admin?replicaSet=mgset-74245203" - username: "" - password: "" + uri: "mongodb://dds-bp1628b447c242e41.mongodb.rds.aliyuncs.com:3717,dds-bp1628b447c242e42.mongodb.rds.aliyuncs.com:3717/admin?replicaSet=mgset-74245203" + username: "root" + password: "Tbuy!vj@24vq" max_pool_size: 16 connection_timeout_ms: 30000 socket_timeout_ms: 5000 From 22b58aabf73fb21eacbd9d77adca8ac847685024 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Sun, 24 Dec 2023 13:03:51 +0800 Subject: [PATCH 5/7] mongo pw --- etc/mix/mix-prod.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml index 8047a795..a114161d 100644 --- a/etc/mix/mix-prod.yaml +++ b/etc/mix/mix-prod.yaml @@ -12,9 +12,9 @@ app: port: 9999 mix_mongo: - uri: "mongodb://dds-bp1628b447c242e41.mongodb.rds.aliyuncs.com:3717,dds-bp1628b447c242e42.mongodb.rds.aliyuncs.com:3717/admin?replicaSet=mgset-74245203" - username: "root" - password: "Tbuy!vj@24vq" + uri: "mongodb://root:Wishpal2024@dds-bp1628b447c242e41.mongodb.rds.aliyuncs.com:3717,dds-bp1628b447c242e42.mongodb.rds.aliyuncs.com:3717/admin?replicaSet=mgset-74245203" + username: "" + password: "" max_pool_size: 16 connection_timeout_ms: 30000 socket_timeout_ms: 5000 From 5cc64f205d93e4e1c0715392e218739865810ce7 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Sun, 24 Dec 2023 13:06:53 +0800 Subject: [PATCH 6/7] redis port --- etc/mix/mix-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml index a114161d..25a1d646 100644 --- a/etc/mix/mix-prod.yaml +++ b/etc/mix/mix-prod.yaml @@ -82,7 +82,7 @@ media: expire_time: 1800 redis: - uri: "r-bp1slashewonusih6h.redis.rds.aliyuncs.com" + uri: "r-bp1slashewonusih6h.redis.rds.aliyuncs.com:6379" password: "SWEbaxdt6aM@" max_active: 0 max_idle: 0 From ac89ddbf745cefc8a116a071aec35c2e6fdba15d Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Sun, 24 Dec 2023 13:24:01 +0800 Subject: [PATCH 7/7] fix ip --- app/mix/cmd/main.go | 26 +++++++++++++++++++++++++- main.go | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/app/mix/cmd/main.go b/app/mix/cmd/main.go index a0e5af37..ae796b64 100644 --- a/app/mix/cmd/main.go +++ b/app/mix/cmd/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "net" "net/http" "os" "runtime" @@ -21,6 +22,7 @@ import ( "service/library/redis" "service/library/sms" "service/library/validator" + "strings" "time" ) @@ -95,7 +97,7 @@ func main() { validator.InitDefaultNotNullValidator() controller.Init(router) srv := &http.Server{ - Addr: fmt.Sprintf("%s:%d", cfg.App.Ip, cfg.App.Port), + Addr: fmt.Sprintf("%s:%d", GetIp(), cfg.App.Port), Handler: router, } httpserver.StartHttpServer(srv, cfg.DefaultConfig) @@ -107,3 +109,25 @@ func PrintAndExit(msg string) { time.Sleep(1) //wait logger flush os.Exit(1) } + +func GetIp() string { + addrs, err := net.InterfaceAddrs() + if err != nil { + PrintAndExit("get ip fail") + return "127.0.0.1" + } + retIp := "" + for _, address := range addrs { + // 检查ip地址判断是否回环地址 + if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() { + if ipnet.IP.To4() != nil { + ip := ipnet.IP.String() + if strings.HasPrefix(ip, "172.") { + retIp = ip + break + } + } + } + } + return retIp +} diff --git a/main.go b/main.go index 2dd1f6c9..d0a7500d 100644 --- a/main.go +++ b/main.go @@ -4,10 +4,12 @@ import ( "fmt" "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/bwmarrin/snowflake" + "net" "os" "service/library/configcenter" "service/library/redis" "strconv" + "strings" ) func main() { @@ -18,8 +20,31 @@ func main() { n, _ := snowflake.NewNode(6) fmt.Println(n.Generate().Time()) + + fmt.Println(GetIp()) } +func GetIp() string { + addrs, err := net.InterfaceAddrs() + if err != nil { + fmt.Println(err) + return "127.0.0.1" + } + retIp := "" + for _, address := range addrs { + // 检查ip地址判断是否回环地址 + if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() { + if ipnet.IP.To4() != nil { + ip := ipnet.IP.String() + if strings.HasPrefix(ip, "172.") { + retIp = ip + break + } + } + } + } + return retIp +} func UploadImage() { // yourEndpoint填写Bucket对应的Endpoint，以华东1（杭州）为例，填写为https://oss-cn-hangzhou.aliyuncs.com。其它Region请按实际情况填写。 // yourAccessKeyId以及yourAccessKeySecret分别填写从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。