fix: rename open_im to openim

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

.gitignore

@@ -30,17 +30,17 @@ output/
 _output/
 
 ### OpenIM deploy ###
-deploy/open_im_demo
+deploy/openim_demo
-deploy/open_im_api
+deploy/openim_api
-deploy/open_im_msg_gateway
+deploy/openim_msg_gateway
-deploy/open_im_msg_transfer
+deploy/openim_msg_transfer
-deploy/open_im_push
+deploy/openim_push
-deploy/open_im_timer_task
+deploy/openim_timer_task
-deploy/open_im_rpc_user
+deploy/openim_rpc_user
-deploy/open_im_rpc_friend
+deploy/openim_rpc_friend
-deploy/open_im_rpc_group
+deploy/openim_rpc_group
-deploy/open_im_rpc_msg
+deploy/openim_rpc_msg
-deploy/open_im_rpc_auth
+deploy/openim_rpc_auth
 deploy/Open-IM-SDK-Core
 
 # files used by the developer

CHANGELOG/CHANGELOG-0.0.0.md

@@ -142,7 +142,7 @@
 
 ### Pb
 
-* open_im_sdk.OfflinePushInfo
+* openim_sdk.OfflinePushInfo
 
 ### Pull Requests
 
@@ -162,7 +162,7 @@
 
 ### Pb
 
-* open_im_sdk.OfflinePushInfo
+* openim_sdk.OfflinePushInfo
 
 
 <a name="v1.0.5"></a>
@@ -225,4 +225,3 @@
 
 * Merge pull request [#7](https://github.com/OpenIMSDK/Open-IM-Server/issues/7) from memory-qianxiao/docker-compose_update
 * Merge pull request [#4](https://github.com/OpenIMSDK/Open-IM-Server/issues/4) from wujingke/patch-1
-

Makefile

@@ -38,7 +38,7 @@ Options:
 
   BINS             Binaries to build. Default is all binaries under cmd.
                    This option is available when using: make {build}(.multiarch)
-                   Example: make build BINS="open_im_api open_im_cms_api".
+                   Example: make build BINS="openim_api openim_cms_api".
 
   PLATFORMS        Platform to build for. Default is linux_arm64 and linux_amd64.
                    This option is available when using: make {build}.multiarch

cmd/openim_api/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_api
+NAME=openim_api
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

cmd/openim_api/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_api ./
+COPY ./openim_api ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_api","--port", "10002"]
+CMD ["./openim_api","--port", "10002"]

cmd/openim_cmdutils/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_cmd_utils
+NAME=openim_cmd_utils
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

cmd/openim_crontask/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_cron_task
+NAME=openim_cron_task
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

cmd/openim_crontask/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_cron_task ./
+COPY ./openim_cron_task ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_cron_task"]
+CMD ["./openim_cron_task"]

cmd/openim_msggateway/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_msg_gateway
+NAME=openim_msg_gateway
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)
@@ -32,4 +32,3 @@ install:build
 
 clean:
 	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
-

cmd/openim_msggateway/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_msg_gateway ./
+COPY ./openim_msg_gateway ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_msg_gateway","--port", "10140" "--ws_port", "10001"， "--prometheus_port", "20240"]
+CMD ["./openim_msg_gateway","--port", "10140" "--ws_port", "10001"， "--prometheus_port", "20240"]

cmd/openim_msgtransfer/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_msg_transfer
+NAME=openim_msg_transfer
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

cmd/openim_msgtransfer/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_msg_transfer ./
+COPY ./openim_msg_transfer ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_msg_transfer","--prometheus_port", "21400"]
+CMD ["./openim_msg_transfer","--prometheus_port", "21400"]

cmd/openim_push/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_push
+NAME=openim_push
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

cmd/openim_push/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_push ./
+COPY ./openim_push ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_push", "--port", "10170", "--prometheus_port", "20170"]
+CMD ["./openim_push", "--port", "10170", "--prometheus_port", "20170"]

cmd/openim_rpc/openim_rpc_auth/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_auth
+NAME=openim_auth
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)

cmd/openim_rpc/openim_rpc_auth/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_auth ./
+COPY ./openim_auth ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_auth", "--port", "10160"]
+CMD ["./openim_auth", "--port", "10160"]

cmd/openim_rpc/openim_rpc_conversation/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_conversation
+NAME=openim_conversation
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)

cmd/openim_rpc/openim_rpc_conversation/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_conversation ./
+COPY ./openim_conversation ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_conversation", "--port", "10230", "--prometheus_port","20230"]
+CMD ["./openim_conversation", "--port", "10230", "--prometheus_port","20230"]

cmd/openim_rpc/openim_rpc_friend/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_friend
+NAME=openim_friend
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)
@@ -32,5 +32,3 @@ install:build
 
 clean:
 	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
-
-

cmd/openim_rpc/openim_rpc_friend/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_friend ./
+COPY ./openim_friend ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_friend", "--port", "10120", "--prometheus_port","20120"]
+CMD ["./openim_friend", "--port", "10120", "--prometheus_port","20120"]

cmd/openim_rpc/openim_rpc_group/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_group
+NAME=openim_group
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)
@@ -32,8 +32,3 @@ install:build
 
 clean:
 	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
-
-
-
-
-

cmd/openim_rpc/openim_rpc_group/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_group ./
+COPY ./openim_group ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_group", "--port", "10150", "--prometheus_port","20150"]
+CMD ["./openim_group", "--port", "10150", "--prometheus_port","20150"]

cmd/openim_rpc/openim_rpc_msg/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_msg
+NAME=openim_msg
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)
@@ -32,5 +32,3 @@ install:build
 
 clean:
 	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
-
-

cmd/openim_rpc/openim_rpc_msg/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_msg ./
+COPY ./openim_msg ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_msg", "--port", "10130", "--prometheus_port","20130"]
+CMD ["./openim_msg", "--port", "10130", "--prometheus_port","20130"]

cmd/openim_rpc/openim_rpc_third/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_third
+NAME=openim_third
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)
@@ -32,8 +32,3 @@ install:build
 
 clean:
 	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
-
-
-
-
-

cmd/openim_rpc/openim_rpc_third/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_third ./
+COPY ./openim_third ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_third", "--port", "10200"]
+CMD ["./openim_third", "--port", "10200"]

cmd/openim_rpc/openim_rpc_user/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=open_im_user
+NAME=openim_user
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)
@@ -32,8 +32,3 @@ install:build
 
 clean:
 	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
-
-
-
-
-

cmd/openim_rpc/openim_rpc_user/deploy.Dockerfile

@@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
-COPY ./open_im_user ./
+COPY ./openim_user ./
 
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
 
-CMD ["./open_im_user", "--port", "10110"]
+CMD ["./openim_user", "--port", "10110"]

docker-compose.yaml

@@ -99,9 +99,9 @@ services:
     command: minio server /data --console-address ':9090'
 
 
-  open_im_server:
+  openim_server:
-    image: openim/open_im_server:v3.0.1
+    image: openim/openim_server:v3.0.1
-    container_name: open_im_server
+    container_name: openim_server
     volumes:
       - ./logs:/Open-IM-Server/logs
       - ./config/config.yaml:/Open-IM-Server/config/config.yaml
@@ -131,7 +131,7 @@ services:
       - mongodb
       - redis
       - minio
-      - open_im_server
+      - openim_server
     network_mode: "host"
     logging:
       driver: json-file
@@ -147,7 +147,7 @@ services:
     #    ports:
     #    - 9091:9091
     depends_on:
-      - open_im_server
+    - openim_server
     command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
     network_mode: "host"
 

scripts/build_images.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-image=openim/open_im_server:v1.0.5
+image=openim/openim_server:v1.0.5
 rm Open-IM-Server -rf
 git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
 cd Open-IM-Server

scripts/check_all.sh

@@ -34,7 +34,7 @@ for i in ${service_port_name[*]}; do
   list=$(cat $config_path | grep -w ${i} | awk -F '[:]' '{print $NF}')
   list_to_string $list
   for j in ${ports_array}; do
-    port=$(ss -tunlp| grep open_im | awk '{print $5}' | grep -w ${j} | awk -F '[:]' '{print $NF}')
+    port=$(ss -tunlp| grep openim | awk '{print $5}' | grep -w ${j} | awk -F '[:]' '{print $NF}')
     if [[ ${port} -ne ${j} ]]; then
       echo -e ${YELLOW_PREFIX}${i}${COLOR_SUFFIX}${RED_PREFIX}" service does not start normally,not initiated port is "${COLOR_SUFFIX}${YELLOW_PREFIX}${j}${COLOR_SUFFIX}
       echo -e ${RED_PREFIX}"please check ../logs/openIM.log "${COLOR_SUFFIX}

scripts/enterprise/check_all.sh

@@ -29,7 +29,7 @@ for i in ${service_port_name[*]}; do
   list=$(cat $config_path | grep -w ${i} | awk -F '[:]' '{print $NF}')
   list_to_string $list
   for j in ${ports_array}; do
-    port=$(ss -tunlp| grep open_im | awk '{print $5}' | grep -w ${j} | awk -F '[:]' '{print $NF}')
+    port=$(ss -tunlp| grep openim | awk '{print $5}' | grep -w ${j} | awk -F '[:]' '{print $NF}')
     if [[ ${port} -ne ${j} ]]; then
       echo -e ${YELLOW_PREFIX}${i}${COLOR_SUFFIX}${RED_PREFIX}" service does not start normally,not initiated port is "${COLOR_SUFFIX}${YELLOW_PREFIX}${j}${COLOR_SUFFIX}
       echo -e ${RED_PREFIX}"please check ../logs/openIM.log "${COLOR_SUFFIX}
@@ -39,4 +39,3 @@ for i in ${service_port_name[*]}; do
     fi
   done
 done
-

scripts/enterprise/path_info.cfg

@@ -1,7 +1,7 @@
 #Don't put the space between "="
 
 
-demo_server_name="open_im_chat_api"
+demo_server_name="openim_chat_api"
 demo_server_binary_root="../bin/"
 
 
@@ -21,9 +21,9 @@ service_source_root=(
 #service filename
 service_names=(
   #api service filename
-  open_im_chat_api
+  openim_chat_api
-   open_im_admin_api
+   openim_admin_api
   #rpc service filename
-  open_im_admin
+  openim_admin
-  open_im_chat
+  openim_chat
 )

scripts/make-rules/golang.mk

@@ -71,20 +71,20 @@ EXCLUDE_TESTS=github.com/OpenIMSDK/Open-IM-Server/test github.com/OpenIMSDK/Open
 # ❯ tree -L 1 cmd
 # cmd
 # ├── openim-sdk-core/ - main.go
-# ├── open_im_api	
+# ├── openim_api	
-# ├── open_im_cms_api
+# ├── openim_cms_api
-# ├── open_im_cron_task
+# ├── openim_cron_task
-# ├── open_im_demo
+# ├── openim_demo
-# ├── open_im_msg_gateway
+# ├── openim_msg_gateway
-# ├── open_im_msg_transfer
+# ├── openim_msg_transfer
-# ├── open_im_push
+# ├── openim_push
-# ├── rpc/open_im_admin_cms/ - main.go
+# ├── rpc/openim_admin_cms/ - main.go
 # └── test/ - main.go
 # COMMAND=openim
 # PLATFORM=linux_amd64
 # OS=linux
 # ARCH=amd64
-# BINS=open_im_api open_im_cms_api open_im_cron_task open_im_demo open_im_msg_gateway open_im_msg_transfer open_im_push 
+# BINS=openim_api openim_cms_api openim_cron_task openim_demo openim_msg_gateway openim_msg_transfer openim_push 
 # BIN_DIR=/root/workspaces/OpenIM/_output/bin
 # ==============================================================================
 

scripts/path_info.cfg

@@ -1,35 +1,35 @@
 #Don't put the space between "="
-msg_gateway_name="open_im_msg_gateway"
+msg_gateway_name="openim_msg_gateway"
 msg_gateway_binary_root="../bin/"
 msg_gateway_source_root="../cmd/msggateway/"
 
-msg_name="open_im_msg"
+msg_name="openim_msg"
 msg_binary_root="../bin/"
 msg_source_root="../cmd/rpc/msg/"
 
-push_name="open_im_push"
+push_name="openim_push"
 push_binary_root="../bin/"
 push_source_root="../cmd/push/"
 
 
 
-msg_transfer_name="open_im_msg_transfer"
+msg_transfer_name="openim_msg_transfer"
 msg_transfer_binary_root="../bin/"
 msg_transfer_source_root="../cmd/msgtransfer/"
 msg_transfer_service_num=4
 
 
-sdk_server_name="open_im_sdk_server"
+sdk_server_name="openim_sdk_server"
 sdk_server_binary_root="../bin/"
 sdk_server_source_root="../cmd/Open-IM-SDK-Core/"
 
 
-cron_task_name="open_im_cron_task"
+cron_task_name="openim_cron_task"
 cron_task_binary_root="../bin/"
 cron_task_source_root="../cmd/crontask/"
 
 
-cmd_utils_name="open_im_cmd_utils"
+cmd_utils_name="openim_cmd_utils"
 cmd_utils_binary_root="../bin/"
 cmd_utils_source_root="../cmd/cmduitls/"
 
@@ -57,15 +57,15 @@ service_source_root=(
 #service filename
 service_names=(
   #api service filename
-  open_im_api
+  openim_api
   #rpc service filename
-  open_im_user
+  openim_user
-  open_im_friend
+  openim_friend
-  open_im_group
+  openim_group
-  open_im_auth
+  openim_auth
-  open_im_conversation
+  openim_conversation
-  open_im_third
+  openim_third
-  open_im_cron_task
+  openim_cron_task
   ${msg_gateway_name}
   ${msg_transfer_name}
   ${msg_name}

scripts/start_rpc_service.sh

@@ -21,15 +21,15 @@ source ./function.sh
 #service filename
 service_filename=(
   #api
-  open_im_api
+  openim_api
   #rpc
-  open_im_user
+  openim_user
-  open_im_friend
+  openim_friend
-  open_im_group
+  openim_group
-  open_im_auth
+  openim_auth
   ${msg_name}
-  open_im_conversation
+  openim_conversation
-  open_im_third
+  openim_third
 )
 
 #service config port name