Merge branch 'main' into v2.3.0release

# Conflicts:
#	.env
#	install_im_server.sh

config/config.yaml

@@ -33,8 +33,8 @@ mongo:
   dbTimeout: 60
   dbDatabase: openIM  #mongo db 默认即可
   dbSource: admin
-  dbUserName:  #mongo用户名，建议先不设置
+  dbUserName: root #mongo用户名，建议先不设置
-  dbPassword:  #mongo密码，建议先不设置
+  dbPassword: openIM  #mongo密码，建议先不设置
   dbMaxPoolSize: 100
   dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改
   chatRecordsClearTime: "* * * * *" # 每天凌晨3点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * *

deploy_k8s/admin_cms/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: admin-cms
-          image: openim/admin_cms:v2.3.0release
+          image: openim/admin_cms:v2.3.3
           # imagePullPolicy: Always #每次启动都重新拉取镜像
           ports:
             - containerPort: 10200

deploy_k8s/api/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: api
-        image: openim/api:v2.3.0release
+        image: openim/api:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10002

deploy_k8s/auth/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: auth
-        image: openim/auth:v2.3.0release
+        image: openim/auth:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10160

deploy_k8s/cache/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cache
-        image: openim/cache:v2.3.0release
+        image: openim/cache:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10240

deploy_k8s/cms_api/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cms-api
-        image: openim/cms_api:v2.3.0release
+        image: openim/cms_api:v2.3.3
         imagePullPolicy: Always
         ports:
         - containerPort: 10006

deploy_k8s/conversation/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: conversation
-          image: openim/conversation:v2.3.0release
+          image: openim/conversation:v2.3.3
           # imagePullPolicy: Always
           ports:
             - containerPort: 10230

deploy_k8s/demo/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: demo
-        image: openim/demo:v2.3.0release
+        image: openim/demo:v2.3.3
         imagePullPolicy: Always
         ports:
         - containerPort: 10004

deploy_k8s/friend/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: friend
-        image: openim/friend:v2.3.0release
+        image: openim/friend:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10120

deploy_k8s/group/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: group
-        image: openim/group:v2.3.0release
+        image: openim/group:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10150

deploy_k8s/msg/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg
-        image: openim/msg:v2.3.0release
+        image: openim/msg:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10130

deploy_k8s/msg_gateway/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-gateway
-        image: openim/msg_gateway:v2.3.0release
+        image: openim/msg_gateway:v2.3.3
         # imagePullPolicy: Always
         ports:
         - name: rpc-port

deploy_k8s/msg_transfer/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-transfer
-        image: openim/msg_transfer:v2.3.0release
+        image: openim/msg_transfer:v2.3.3
         # imagePullPolicy: Always
         volumeMounts:
           - name: config

deploy_k8s/office/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: office
-        image: openim/office:v2.3.0release
+        image: openim/office:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10210

deploy_k8s/organization/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: organization
-        image: openim/organization:v2.3.0release
+        image: openim/organization:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10220

deploy_k8s/push/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: push
-        image: openim/push:v2.3.0release
+        image: openim/push:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10170

deploy_k8s/sdk_server/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: sdk-server
-        image: openim/sdk_server:v2.3.0release
+        image: openim/sdk_server:v2.3.3
         # imagePullPolicy: Always
         ports:
         - containerPort: 10003

deploy_k8s/user/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: user
-        image: openim/user:v2.3.0release
+        image: openim/user:v2.3.3
         # imagePullPolicy: Always
         volumeMounts:
           - name: config

init_docker.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+cd script ;
+chmod +x *.sh ;
+./env_check.sh;
+cd .. ;
+docker-compose up -d;
+cd script ;
+./docker_check_service.sh

install_im_server.sh

@@ -5,6 +5,5 @@ chmod +x *.sh ;
 ./env_check.sh;
 cd .. ;
 docker-compose up -d;
-echo "upppp...."
 cd script ;
 ./docker_check_service.sh

script/.env

@@ -0,0 +1,3 @@
+USER=root
+PASSWORD=openIM
+DATA_DIR=./