From ea0365b9da18850277917fa83af9ee8aae6de665 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 14 Nov 2022 18:17:41 +0800 Subject: [PATCH] Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release # Conflicts: # config/usualConfig.yaml --- .env | 2 +- script/init_pwd.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index e8d8fd818..7fdf0e3b3 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ USER=root PASSWORD=openIM123 -MINIO_ENDPOINT=127.0.0.1:10005 +MINIO_ENDPOINT=http://127.0.0.1:10005 DATA_DIR=./ \ No newline at end of file diff --git a/script/init_pwd.sh b/script/init_pwd.sh index 0944766a3..388c3e660 100644 --- a/script/init_pwd.sh +++ b/script/init_pwd.sh @@ -5,5 +5,5 @@ echo "your user is:$USER" echo "your password is:$PASSWORD" echo "your minio endPoint:$MINIO_ENDPOINT" -sed -i "/^\([[:space:]]*dbMysqlUserName: *\).*/s//\1$USER/;/\([[:space:]]*dbUserName: *\).*/s//\1$USER/;/\([[:space:]]*accessKeyID: *\).*/s//\1$USER/;/\([[:space:]]*endpoint: *\).*/s//\1$MINIO_ENDPOINT/;" ../config/usualConfig.yaml +sed -i "/^\([[:space:]]*dbMysqlUserName: *\).*/s//\1$USER/;/\([[:space:]]*dbUserName: *\).*/s//\1$USER/;/\([[:space:]]*accessKeyID: *\).*/s//\1$USER/;/\([[:space:]]*endpoint: *\).*/s//\1\"$MINIO_ENDPOINT\"/;" ../config/usualConfig.yaml sed -i "/^\([[:space:]]*dbMysqlPassword: *\).*/s//\1$PASSWORD/;/\([[:space:]]*dbPassword: *\).*/s//\1$PASSWORD/;/\([[:space:]]*dbPassWord: *\).*/s//\1$PASSWORD/;/\([[:space:]]*secretAccessKey: *\).*/s//\1$PASSWORD/;" ../config/usualConfig.yaml \ No newline at end of file