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

# Conflicts:
#	config/usualConfig.yaml
This commit is contained in:
wangchuxiao 2022-11-14 18:07:14 +08:00
commit f8ca38b7e3
3 changed files with 15 additions and 13 deletions

1
.env
View File

@ -1,3 +1,4 @@
USER=root USER=root
PASSWORD=openIM123 PASSWORD=openIM123
MINIO_ENDPOINT=127.0.0.1:10005
DATA_DIR=./ DATA_DIR=./

View File

@ -4,16 +4,16 @@ etcd:
secret: openIM123 # etcd 配置密钥 secret: openIM123 # etcd 配置密钥
mysql: mysql:
dbMysqlUserName: root #mysql用户名,建议修改 dbMysqlUserName: root #mysql用户名
dbMysqlPassword: openIM123 # mysql密码,建议修改 dbMysqlPassword: openIM123 # mysql密码
mongo: mongo:
dbUserName: root #mongo用户名,建议先不设置 dbUserName: root #mongo用户名
dbPassword: openIM123 #mongo密码,建议先不设置 dbPassword: openIM123 #mongo密码
redis: redis:
dbUserName: dbUserName:
dbPassWord: openIM123 #redis密码 建议修改 dbPassWord: openIM123 #redis密码
kafka: kafka:
SASLUserName: SASLUserName:
@ -25,19 +25,19 @@ credential:
accessKeyID: root accessKeyID: root
secretAccessKey: openIM123 secretAccessKey: openIM123
secret: tuoyun secret: tuoyun #建议修改
tokenpolicy: tokenpolicy:
accessSecret: "open_im_server" #token生成相关,默认即可 accessSecret: "open_im_server" #token生成相关 建议修改
accessExpire: 90 #token过期时间 默认即可 accessExpire: 90 #token过期时间 默认即可
messageverify: messageverify:
friendVerify: false friendVerify: false #发送消息是否验证好友关系 false表示不验证好友关系
push: push:
getui: #个推推送 getui:
pushUrl: "https://restapi.getui.com/v2/$appId" pushUrl: "https://restapi.getui.com/v2/$appId"
masterSecret: "" masterSecret: "" #需添加
appKey: "" appKey: "" #需添加
enable: false enable: false #true启动个推推送

View File

@ -3,6 +3,7 @@
source ../.env source ../.env
echo "your user is:$USER" echo "your user is:$USER"
echo "your password is:$PASSWORD" 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/;" ../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 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