Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release

# Conflicts:
#	config/usualConfig.yaml
pull/309/head
wangchuxiao 2 years ago
parent f8ca38b7e3
commit ea0365b9da

@ -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=./

@ -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
Loading…
Cancel
Save