diff --git a/.dockerignore b/.dockerignore index c35303ed6..705512401 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ - +.github/ diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml index 0f0aa2049..347f6d762 100644 --- a/.github/workflows/openimci.yml +++ b/.github/workflows/openimci.yml @@ -48,7 +48,7 @@ jobs: strategy: matrix: - go_version: ["1.18","1.19","1.20","1.21"] + go_version: ["1.19","1.20","1.21"] os: [ubuntu-latest] steps: diff --git a/build/Dockerfile b/build/Dockerfile new file mode 100644 index 000000000..5558434b0 --- /dev/null +++ b/build/Dockerfile @@ -0,0 +1,7 @@ +FROM ghcr.io/openim-sigs/openim-bash-image:latest + +WORKDIR /openim/openim-server + +COPY miniblog ./bin/miniblog + +ENTRYPOINT ["./bin/miniblog"] \ No newline at end of file diff --git a/build/images/openim-api/Dockerfile b/build/images/openim-api/Dockerfile index 44d4c6ba4..8c3d710f1 100644 --- a/build/images/openim-api/Dockerfile +++ b/build/images/openim-api/Dockerfile @@ -31,20 +31,15 @@ RUN go mod download COPY . . -RUN make clean RUN make build BINS=openim-api +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-api /usr/bin/openim-api + # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10002 -EXPOSE 10002 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api +COPY --from=builder /usr/bin/openim-api ./bin/openim-api -ENTRYPOINT ["bash", "-c", "openim-api -c $OPENIM_SERVER_CONFIG_NAME --port $PORT"] +ENTRYPOINT ["./bin/openim-api"] diff --git a/build/images/openim-api/Dockerfile.release b/build/images/openim-api/Dockerfile.release deleted file mode 100644 index 8d06221a7..000000000 --- a/build/images/openim-api/Dockerfile.release +++ /dev/null @@ -1,8 +0,0 @@ -FROM ghcr.io/openim-sigs/openim-bash-image:latest - -COPY openim-api /usr/bin/ - -# nosemgrep: dockerfile.security.missing-user.missing-user -ENTRYPOINT ["/usr/bin/openim-api"] -# nosemgrep: dockerfile.security.missing-user.missing-user -CMD ["--help"] \ No newline at end of file diff --git a/build/images/openim-cmdutils/Dockerfile b/build/images/openim-cmdutils/Dockerfile index 56923fe8a..0a4cbd7e6 100644 --- a/build/images/openim-cmdutils/Dockerfile +++ b/build/images/openim-cmdutils/Dockerfile @@ -31,19 +31,15 @@ RUN go mod download COPY . . -RUN go mod download -RUN make clean RUN make build BINS=openim-cmdutils +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-cmdutils /usr/bin/openim-api FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder $OPENIM_SERVER_BINDIR/platforms /openim/openim-server/_output/bin/platforms -COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-cmdutils /usr/bin/openim-cmdutils +COPY --from=builder /usr/bin/openim-cmdutils ./bin/openim-cmdutils -ENTRYPOINT ["openim-cmdutils"] +ENTRYPOINT ["./bin/openim-cmdutils"] CMD ["--help"] diff --git a/build/images/openim-crontask/Dockerfile b/build/images/openim-crontask/Dockerfile index 04334e4ff..35ba75784 100644 --- a/build/images/openim-crontask/Dockerfile +++ b/build/images/openim-crontask/Dockerfile @@ -31,18 +31,15 @@ RUN go mod download COPY . . -RUN make clean RUN make build BINS=openim-crontask +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-crontask /usr/bin/openim-crontask + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV OPENIM_SERVER_CONFIG_NAME=/openim/openim-server/config - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask /usr/bin/openim-crontask +COPY --from=builder /usr/bin/openim-crontask ./bin/openim-crontask -CMD ["bash", "-c", "openim-crontask -c $OPENIM_SERVER_CONFIG_NAME"] +ENTRYPOINT ["./bin/openim-crontask"] diff --git a/build/images/openim-msggateway/Dockerfile b/build/images/openim-msggateway/Dockerfile index 35c4c7a1d..fe9db8f32 100644 --- a/build/images/openim-msggateway/Dockerfile +++ b/build/images/openim-msggateway/Dockerfile @@ -31,22 +31,15 @@ RUN go mod download COPY . . -RUN make clean RUN make build BINS=openim-msggateway +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-msggateway /usr/bin/openim-msggateway + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10140 \ - WS_PORT 10001 - -EXPOSE 10140 -EXPOSE 10001 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway /usr/bin/openim-msggateway +COPY --from=builder /usr/bin/openim-msggateway ./bin/openim-msggateway -CMD ["bash", "-c", "openim-msggateway -c $OPENIM_SERVER_CONFIG_NAME --port $PORT --ws_port $WS_PORT"] \ No newline at end of file +ENTRYPOINT ["./bin/openim-msggateway"] diff --git a/build/images/openim-msgtransfer/Dockerfile b/build/images/openim-msgtransfer/Dockerfile index 57d11be52..c04425f94 100644 --- a/build/images/openim-msgtransfer/Dockerfile +++ b/build/images/openim-msgtransfer/Dockerfile @@ -31,16 +31,15 @@ RUN go mod download COPY . . -RUN make clean RUN make build BINS=openim-msgtransfer +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-msgtransfer /usr/bin/openim-msgtransfer + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer /usr/bin/openim-msgtransfer +COPY --from=builder /usr/bin/openim-msgtransfer ./bin/openim-msgtransfer -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-msgtransfer -c $OPENIM_SERVER_CONFIG_NAME --prometheus_port $PROMETHEUS_PORT; else openim-msgtransfer -c $OPENIM_SERVER_CONFIG_NAME; fi"] \ No newline at end of file +ENTRYPOINT ["./bin/openim-msgtransfer"] diff --git a/build/images/openim-push/Dockerfile b/build/images/openim-push/Dockerfile index 287c43450..e51b7a44c 100644 --- a/build/images/openim-push/Dockerfile +++ b/build/images/openim-push/Dockerfile @@ -15,7 +15,6 @@ # OpenIM base image: https://github.com/openim-sigs/openim-base-image # Set go mod installation source and proxy -# docker run -e "PORT=10003" -e "PROMETHEUSORT=4321" --network host -it 67ef891ad1ff FROM golang:1.20 AS builder @@ -32,21 +31,15 @@ RUN go mod download COPY . . -RUN make clean RUN make build BINS=openim-push +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-push /usr/bin/openim-push + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10170 \ - PROMETHEUS_PORT 20170 - -EXPOSE 10170 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push /usr/bin/openim-push +COPY --from=builder /usr/bin/openim-push ./bin/openim-push -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-push -c $OPENIM_SERVER_CONFIG_NAME --port $PORT --prometheus_port $PROMETHEUS_PORT; else openim-push -c $OPENIM_SERVER_CONFIG_NAME --port $PORT; fi"] \ No newline at end of file +ENTRYPOINT ["./bin/openim-push"] diff --git a/build/images/openim-rpc-auth/Dockerfile b/build/images/openim-rpc-auth/Dockerfile index a581bfc04..8054935bd 100644 --- a/build/images/openim-rpc-auth/Dockerfile +++ b/build/images/openim-rpc-auth/Dockerfile @@ -31,22 +31,15 @@ RUN go mod download COPY . . -RUN make clean - RUN make build BINS=openim-rpc-auth +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth /usr/bin/openim-rpc-auth + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10160 \ - PROMETHEUS_PORT 20160 - -EXPOSE 10160 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth /usr/bin/openim-rpc-auth +COPY --from=builder /usr/bin/openim-rpc-auth ./bin/openim-rpc-auth -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-auth --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-auth --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file +ENTRYPOINT ["./bin/openim-rpc-auth"] diff --git a/build/images/openim-rpc-conversation/Dockerfile b/build/images/openim-rpc-conversation/Dockerfile index 887a77f36..0cfb681a2 100644 --- a/build/images/openim-rpc-conversation/Dockerfile +++ b/build/images/openim-rpc-conversation/Dockerfile @@ -31,22 +31,15 @@ RUN go mod download COPY . . -RUN make clean - RUN make build BINS=openim-rpc-conversation +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation /usr/bin/openim-rpc-conversation + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10230 \ - PROMETHEUS_PORT 20230 - -EXPOSE 10230 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation /usr/bin/openim-rpc-conversation +COPY --from=builder /usr/bin/openim-rpc-conversation ./bin/openim-rpc-conversation -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-conversation --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-conversation --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file +ENTRYPOINT ["./bin/openim-rpc-conversation"] diff --git a/build/images/openim-rpc-friend/Dockerfile b/build/images/openim-rpc-friend/Dockerfile index 9954daf99..36870bc7e 100644 --- a/build/images/openim-rpc-friend/Dockerfile +++ b/build/images/openim-rpc-friend/Dockerfile @@ -31,22 +31,15 @@ RUN go mod download COPY . . -RUN make clean - RUN make build BINS=openim-rpc-friend +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend /usr/bin/openim-rpc-friend + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10120 \ - PROMETHEUS_PORT 20120 - -EXPOSE 10120 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend /usr/bin/openim-rpc-friend +COPY --from=builder /usr/bin/openim-rpc-friend ./bin/openim-rpc-friend -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-friend --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-friend --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] +ENTRYPOINT ["./bin/openim-rpc-friend"] diff --git a/build/images/openim-rpc-group/Dockerfile b/build/images/openim-rpc-group/Dockerfile index 627560075..85ba3b74d 100644 --- a/build/images/openim-rpc-group/Dockerfile +++ b/build/images/openim-rpc-group/Dockerfile @@ -31,22 +31,15 @@ RUN go mod download COPY . . -RUN make clean - RUN make build BINS=openim-rpc-group +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group /usr/bin/openim-rpc-group + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10150 \ - PROMETHEUS_PORT 20150 - -EXPOSE 10150 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group /usr/bin/openim-rpc-group +COPY --from=builder /usr/bin/openim-rpc-group ./bin/openim-rpc-group -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-group --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-group --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file +ENTRYPOINT ["./bin/openim-rpc-group"] diff --git a/build/images/openim-rpc-msg/Dockerfile b/build/images/openim-rpc-msg/Dockerfile index e7426bcf0..7e1aaf50b 100644 --- a/build/images/openim-rpc-msg/Dockerfile +++ b/build/images/openim-rpc-msg/Dockerfile @@ -31,22 +31,15 @@ RUN go mod download COPY . . -RUN make clean - RUN make build BINS=openim-rpc-msg +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg /usr/bin/openim-rpc-msg + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10130 \ - PROMETHEUS_PORT 20130 - -EXPOSE 10130 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg /usr/bin/openim-rpc-msg +COPY --from=builder /usr/bin/openim-rpc-msg ./bin/openim-rpc-msg -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-msg --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-msg --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file +ENTRYPOINT ["./bin/openim-rpc-msg"] diff --git a/build/images/openim-rpc-third/Dockerfile b/build/images/openim-rpc-third/Dockerfile index 700fd2918..ab3e6c949 100644 --- a/build/images/openim-rpc-third/Dockerfile +++ b/build/images/openim-rpc-third/Dockerfile @@ -31,23 +31,15 @@ RUN go mod download COPY . . -RUN make clean - RUN make build BINS=openim-rpc-third +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third /usr/bin/openim-rpc-third +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10190 \ - PROMETHEUS_PORT 21301 - -EXPOSE 10190 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third /usr/bin/openim-rpc-third +COPY --from=builder /usr/bin/openim-rpc-third ./bin/openim-rpc-third -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-third --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-third --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] +ENTRYPOINT ["./bin/openim-rpc-third"] diff --git a/build/images/openim-rpc-user/Dockerfile b/build/images/openim-rpc-user/Dockerfile index 00804f2bf..cd0121b7d 100644 --- a/build/images/openim-rpc-user/Dockerfile +++ b/build/images/openim-rpc-user/Dockerfile @@ -31,22 +31,15 @@ RUN go mod download COPY . . -RUN make clean - RUN make build BINS=openim-rpc-user +RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user /usr/bin/openim-rpc-user + +# FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ -COPY --from=builder /openim/openim-server/config /openim/openim-server/config - -ENV PORT 10110 \ - PROMETHEUS_PORT 20110 - -EXPOSE 10110 - -RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user /usr/bin/openim-rpc-user +COPY --from=builder /usr/bin/openim-rpc-user ./bin/openim-rpc-user -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-user --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-user --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] +ENTRYPOINT ["./bin/openim-rpc-user"] diff --git a/go.mod b/go.mod index 8510f780d..c26bcad59 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openimsdk/open-im-server/v3 -go 1.18 +go 1.19 require ( firebase.google.com/go v3.13.0+incompatible diff --git a/go.work b/go.work index 6800fa496..1c819212c 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.18 +go 1.19 use ( . diff --git a/pkg/common/config/version b/pkg/common/config/version index aa6c89679..e682ea429 100644 --- a/pkg/common/config/version +++ b/pkg/common/config/version @@ -1 +1 @@ -v3.2.0 \ No newline at end of file +v3.3.0 \ No newline at end of file diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index 742016cbd..3a57d1135 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -17,7 +17,7 @@ # GO := go -GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21|1.22 +GO_SUPPORTED_VERSIONS ?= 1.19|1.20|1.21|1.22 GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \ -X $(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) \ diff --git a/test/typecheck/go.mod b/test/typecheck/go.mod index f644c5b25..9ef1b1da7 100644 --- a/test/typecheck/go.mod +++ b/test/typecheck/go.mod @@ -1,6 +1,6 @@ module github.com/openimsdk/open-im-server/test/typecheck -go 1.18 +go 1.19 require golang.org/x/tools v0.12.0 diff --git a/tests/group_test.go b/tests/group_test.go deleted file mode 100644 index 54878805e..000000000 --- a/tests/group_test.go +++ /dev/null @@ -1,22 +0,0 @@ -package tests - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" -) - -func TestDeleteGroupMemberHash(t *testing.T) { - mockGroupDB := new(controller.MockGroupDatabase) - - testGroupMemberHash := "testGroupMemberHash" - - err := mockGroupDB.DeleteGroupMemberHash(testGroupMemberHash) - assert.Nil(t, err) - - nonExistentGroupMemberHash := "nonExistentGroupMemberHash" - - err = mockGroupDB.DeleteGroupMemberHash(nonExistentGroupMemberHash) - assert.NotNil(t, err) -} diff --git a/tests/user_test.go b/tests/user_test.go deleted file mode 100644 index 5278f27f1..000000000 --- a/tests/user_test.go +++ /dev/null @@ -1,51 +0,0 @@ -package cache_test - -import ( - "reflect" - "testing" - - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" -) - -func TestRemoveRepeatedElementsInList(t *testing.T) { - testCases := []struct { - name string - input []string - expected []string - }{ - { - name: "No duplicates", - input: []string{"a", "b", "c"}, - expected: []string{"a", "b", "c"}, - }, - { - name: "All duplicates", - input: []string{"a", "a", "a"}, - expected: []string{"a"}, - }, - { - name: "Some duplicates", - input: []string{"a", "b", "a", "c", "b"}, - expected: []string{"a", "b", "c"}, - }, - { - name: "Empty list", - input: []string{}, - expected: []string{}, - }, - { - name: "Single element", - input: []string{"a"}, - expected: []string{"a"}, - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - result := cache.RemoveRepeatedElementsInList(tc.input) - if !reflect.DeepEqual(result, tc.expected) { - t.Errorf("expected %v, got %v", tc.expected, result) - } - }) - } -} diff --git a/tools/changelog/go.mod b/tools/changelog/go.mod index 924f6709a..b5a2272a4 100644 --- a/tools/changelog/go.mod +++ b/tools/changelog/go.mod @@ -1,3 +1,3 @@ module github.com/openimsdk/open-im-server/v3/tools/changelog -go 1.18 +go 1.19 diff --git a/tools/component/go.mod b/tools/component/go.mod index 8d5548ee8..05a27bcad 100644 --- a/tools/component/go.mod +++ b/tools/component/go.mod @@ -1,3 +1,3 @@ module github.com/openimsdk/open-im-server/v3/tools/component -go 1.18 +go 1.19 diff --git a/tools/data-conversion/go.mod b/tools/data-conversion/go.mod index 51cc32f2e..b0d7aea13 100644 --- a/tools/data-conversion/go.mod +++ b/tools/data-conversion/go.mod @@ -1,6 +1,6 @@ module github.com/openimsdk/open-im-server/v3/tools/data-conversion -go 1.18 +go 1.19 require ( github.com/IBM/sarama v1.41.2 diff --git a/tools/imctl/go.mod b/tools/imctl/go.mod index 60b06b45b..e3a720b27 100644 --- a/tools/imctl/go.mod +++ b/tools/imctl/go.mod @@ -1,6 +1,6 @@ module github.com/openimsdk/open-im-server/v3/tools/imctl -go 1.18 +go 1.19 require ( github.com/MakeNowJust/heredoc/v2 v2.0.1 diff --git a/tools/infra/go.mod b/tools/infra/go.mod index 6ee10304b..a6cf16c77 100644 --- a/tools/infra/go.mod +++ b/tools/infra/go.mod @@ -1,3 +1,3 @@ module github.com/openimsdk/open-im-server/v3/tools/infra -go 1.18 +go 1.19 diff --git a/tools/ncpu/go.mod b/tools/ncpu/go.mod index dfccea27a..66697e350 100644 --- a/tools/ncpu/go.mod +++ b/tools/ncpu/go.mod @@ -1,5 +1,5 @@ module github.com/openimsdk/open-im-server/v3/tools/ncpu -go 1.18 +go 1.19 require go.uber.org/automaxprocs v1.5.3 diff --git a/tools/openim-web/go.mod b/tools/openim-web/go.mod index 6f30c673c..deb24f4e5 100644 --- a/tools/openim-web/go.mod +++ b/tools/openim-web/go.mod @@ -1,6 +1,6 @@ module github.com/openimsdk/open-im-server/v3/tools/openim-web -go 1.18 +go 1.19 require gopkg.in/yaml.v2 v2.4.0 diff --git a/tools/versionchecker/go.mod b/tools/versionchecker/go.mod index 5858649e8..619bcdb5b 100644 --- a/tools/versionchecker/go.mod +++ b/tools/versionchecker/go.mod @@ -1,3 +1,3 @@ module github.com/openimsdk/open-im-server/v3/tools/versionchecker -go 1.18 +go 1.19 diff --git a/tools/yamlfmt/go.mod b/tools/yamlfmt/go.mod index 5b3581efc..7c496a530 100644 --- a/tools/yamlfmt/go.mod +++ b/tools/yamlfmt/go.mod @@ -1,6 +1,6 @@ module github.com/openimsdk/open-im-server/v3/tools/yamlfmt -go 1.18 +go 1.19 require ( github.com/likexian/gokit v0.25.13