diff --git a/.env b/.env
index 75f9707da..048662d97 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
USER=root
PASSWORD=openIM123
MINIO_ENDPOINT=http://127.0.0.1:10005
+API_URL=http://127.0.0.1:10002/object/
DATA_DIR=./
diff --git a/.github/workflows/golangci-link.yml b/.github/workflows/golangci-link.yml
index c5fdd7b1b..f3664c1bc 100644
--- a/.github/workflows/golangci-link.yml
+++ b/.github/workflows/golangci-link.yml
@@ -45,7 +45,7 @@ jobs:
# args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
# Optional: show only new issues if it's a pull request. The default value is `false`.
- only-new-issues: true
+ # only-new-issues: true
# Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
install-mode: "goinstall"
\ No newline at end of file
diff --git a/.github/workflows/openim-ci.yml b/.github/workflows/openim-ci.yml
index 5794b2ef3..73b30e42b 100644
--- a/.github/workflows/openim-ci.yml
+++ b/.github/workflows/openim-ci.yml
@@ -66,6 +66,7 @@ jobs:
run: |
make format
echo "Run go format successfully"
+ continue-on-error: true
# - name: Generate all necessary files, such as error code files
# run: |
@@ -149,4 +150,4 @@ jobs:
# uses: goreleaser/goreleaser-action@v4
# with:
# version: latest
-# args: release --clean --skip-publish --snapshot
\ No newline at end of file
+# args: release --clean --skip-publish --snapshot
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..280804c94
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,37 @@
+name: goreleaser
+
+on:
+ push:
+ # run only against tags
+ tags:
+ - '*'
+
+permissions:
+ contents: write
+ # packages: write
+ # issues: write
+
+jobs:
+ goreleaser:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - run: git fetch --force --tags
+ - uses: actions/setup-go@v4
+ with:
+ go-version: stable
+ # More assembly might be required: Docker logins, GPG, etc. It all depends
+ # on your needs.
+ - uses: goreleaser/goreleaser-action@v4
+ with:
+ # either 'goreleaser' (default) or 'goreleaser-pro':
+ distribution: goreleaser
+ version: latest
+ args: release --clean
+ env:
+ GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+ # Your GoReleaser Pro key, if you are using the 'goreleaser-pro'
+ # distribution:
+ # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
diff --git a/.gitignore b/.gitignore
index bac199fc2..d8c6b0286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -391,3 +391,4 @@ Sessionx.vim
[._]*.un~
# End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
+.idea
\ No newline at end of file
diff --git a/.golangci.yml b/.golangci.yml
index 8326afe12..ef7c1f811 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,10 +1,27 @@
+# Copyright © 2023 OpenIMSDK open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file contains all available configuration options
+# with their default values.
+
# options for analysis running
run:
# default concurrency is a available CPU number
concurrency: 4
# timeout for analysis, e.g. 30s, 5m, default is 1m
- timeout: 1m
+ timeout: 5m
# exit code when at least one issue was found, default is 1
issues-exit-code: 1
@@ -12,10 +29,36 @@ run:
# include test files or not, default is true
tests: true
+ # list of build tags, all linters use it. Default is empty list.
+ build-tags:
+ - mytag
+
+ # which dirs to skip: issues from them won't be reported;
+ # can use regexp here: generated.*, regexp is applied on full path;
+ # default value is empty list, but default dirs are skipped independently
+ # from this option's value (see skip-dirs-use-default).
+ # "/" will be replaced by current OS file path separator to properly work
+ # on Windows.
+ skip-dirs:
+ - util
+ - .*~
+ - api/swagger/docs
+ - server/docs
+
# default is true. Enables skipping of directories:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
skip-dirs-use-default: true
+ # which files to skip: they will be analyzed, but issues from them
+ # won't be reported. Default value is empty list, but there is
+ # no need to include all autogenerated files, we confidently recognize
+ # autogenerated files. If it's not please let us know.
+ # "/" will be replaced by current OS file path separator to properly work
+ # on Windows.
+ skip-files:
+ - ".*\\.my\\.go$"
+ - _test.go
+
# by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
# If invoked with -mod=readonly, the go command is disallowed from the implicit
# automatic updating of go.mod described above. Instead, it fails when any changes
@@ -30,6 +73,7 @@ run:
# If false (default) - golangci-lint acquires file lock on start.
allow-parallel-runners: true
+
# output configuration options
output:
# colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
@@ -44,9 +88,26 @@ output:
# make issues output unique by line, default is true
uniq-by-line: true
+ # add a prefix to the output file references; default is no prefix
+ path-prefix: ""
+
+ # sorts results by: filepath, line and column
+ sort-results: true
# all available settings of specific linters
linters-settings:
+ bidichk:
+ # The following configurations check for all mentioned invisible unicode
+ # runes. It can be omitted because all runes are enabled by default.
+ left-to-right-embedding: true
+ right-to-left-embedding: true
+ pop-directional-formatting: true
+ left-to-right-override: true
+ right-to-left-override: true
+ left-to-right-isolate: true
+ right-to-left-isolate: true
+ first-strong-isolate: true
+ pop-directional-isolate: true
dogsled:
# checks assignments with too many blank identifiers; default is 2
max-blank-identifiers: 2
@@ -62,47 +123,217 @@ linters-settings:
# default is false: such cases aren't reported by default.
check-blank: false
+ # [deprecated] comma-separated list of pairs of the form pkg:regex
+ # the regex is used to ignore names within pkg. (default "fmt:.*").
+ # see https://github.com/kisielk/errcheck#the-deprecated-method for details
+ #ignore: GenMarkdownTree,os:.*,BindPFlags,WriteTo,Help
+ #ignore: (os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv
+
# path to a file containing a list of functions to exclude from checking
# see https://github.com/kisielk/errcheck#excluding-functions for details
#exclude: errcheck.txt
+
+ errorlint:
+ # Check whether fmt.Errorf uses the %w verb for formatting errors. See the readme for caveats
+ errorf: true
+ # Check for plain type assertions and type switches
+ asserts: true
+ # Check for plain error comparisons
+ comparison: true
+
exhaustive:
+ # check switch statements in generated files also
+ check-generated: false
# indicates that switch statements are to be considered exhaustive if a
# 'default' case is present, even if all enum members aren't listed in the
# switch
default-signifies-exhaustive: false
+ # enum members matching the supplied regex do not have to be listed in
+ # switch statements to satisfy exhaustiveness
+ ignore-enum-members: ""
+ # consider enums only in package scopes, not in inner scopes
+ package-scope-only: false
+ exhaustivestruct:
+ struct-patterns:
+ - '*.Test'
+ - '*.Test2'
+ - '*.Embedded'
+ - '*.External'
+
+ # forbidigo:
+ # # Forbid the following identifiers (identifiers are written using regexp):
+ # forbid:
+ # - ^print.*$
+ # - 'fmt\.Print.*'
+ # - fmt.Println.* # too much log noise
+ # - ginkgo\\.F.* # these are used just for local development
+ # # Exclude godoc examples from forbidigo checks. Default is true.
+ # exclude_godoc_examples: false
funlen:
lines: 150
- statements: 40
+ statements: 50
+ gci:
+ # put imports beginning with prefix after 3rd-party packages;
+ # only support one prefix
+ # if not set, use goimports.local-prefixes
+ prefix: github.com/OpenIMSDK/OpenKF
gocognit:
# minimal code complexity to report, 30 by default (but we recommend 10-20)
min-complexity: 30
- nestif:
- # minimal complexity of if statements to report, 5 by default
- min-complexity: 4
goconst:
# minimal length of string constant, 3 by default
- min-len: 5
+ min-len: 3
# minimal occurrences count to trigger, 3 by default
- min-occurrences: 5
+ min-occurrences: 3
+ # ignore test files, false by default
+ ignore-tests: false
+ # look for existing constants matching the values, true by default
+ match-constant: true
+ # search also for duplicated numbers, false by default
+ numbers: false
+ # minimum value, only works with goconst.numbers, 3 by default
+ min: 3
+ # maximum value, only works with goconst.numbers, 3 by default
+ max: 3
+ # ignore when constant is not used as function argument, true by default
+ ignore-calls: true
+
+ gocritic:
+ # Which checks should be enabled; can't be combined with 'disabled-checks';
+ # See https://go-critic.github.io/overview#checks-overview
+ # To check which checks are enabled run `GL_DEBUG=gocritic golangci-lint run`
+ # By default list of stable checks is used.
+ enabled-checks:
+ #- rangeValCopy
+ - nestingreduce
+ - truncatecmp
+ - unnamedresult
+ - ruleguard
+
+ # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
+ disabled-checks:
+ - regexpMust
+ - ifElseChain
+ #- exitAfterDefer
+
+ # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
+ # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags".
+ enabled-tags:
+ - performance
+ disabled-tags:
+ - experimental
+
+ # Settings passed to gocritic.
+ # The settings key is the name of a supported gocritic checker.
+ # The list of supported checkers can be find in https://go-critic.github.io/overview.
+ settings:
+ captLocal: # must be valid enabled check name
+ # whether to restrict checker to params only (default true)
+ paramsOnly: true
+ elseif:
+ # whether to skip balanced if-else pairs (default true)
+ skipBalanced: true
+ hugeParam:
+ # size in bytes that makes the warning trigger (default 80)
+ sizeThreshold: 80
+ nestingReduce:
+ # min number of statements inside a branch to trigger a warning (default 5)
+ bodyWidth: 5
+ rangeExprCopy:
+ # size in bytes that makes the warning trigger (default 512)
+ sizeThreshold: 512
+ # whether to check test functions (default true)
+ skipTestFuncs: true
+ rangeValCopy:
+ # size in bytes that makes the warning trigger (default 128)
+ sizeThreshold: 32
+ # whether to check test functions (default true)
+ skipTestFuncs: true
+ ruleguard:
+ # path to a gorules file for the ruleguard checker
+ rules: ''
+ truncateCmp:
+ # whether to skip int/uint/uintptr types (default true)
+ skipArchDependent: true
+ underef:
+ # whether to skip (*x).method() calls where x is a pointer receiver (default true)
+ skipRecvDeref: true
+ unnamedResult:
+ # whether to check exported functions
+ checkExported: true
gocyclo:
# minimal code complexity to report, 30 by default (but we recommend 10-20)
min-complexity: 30
+ cyclop:
+ # the maximal code complexity to report
+ max-complexity: 50
+ # the maximal average package complexity. If it's higher than 0.0 (float) the check is enabled (default 0.0)
+ package-average: 0.0
+ # should ignore tests (default false)
+ skip-tests: false
godot:
- # check all top-level comments, not only declarations
- check-all: false
+ # comments to be checked: `declarations`, `toplevel`, or `all`
+ scope: declarations
+ # list of regexps for excluding particular comment lines from check
+ exclude:
+ # example: exclude comments which contain numbers
+ # - '[0-9]+'
+ # check that each sentence starts with a capital letter
+ capital: false
godox:
# report any comments starting with keywords, this is useful for TODO or FIXME comments that
# might be left in the code accidentally and should be resolved before merging
keywords: # default keywords are TODO, BUG, and FIXME, these can be overwritten by this setting
+ #- TODO
+ - BUG
+ - FIXME
+ #- NOTE
- OPTIMIZE # marks code that should be optimized before merging
- HACK # marks hack-arounds that should be removed before merging
gofmt:
# simplify code: gofmt with `-s` option, true by default
simplify: true
+
+ gofumpt:
+ # Select the Go version to target. The default is `1.18`.
+ lang-version: "1.20"
+
+ # Choose whether or not to use the extra rules that are disabled
+ # by default
+ extra-rules: false
+
+ goheader:
+ values:
+ const:
+ # define here const type values in format k:v, for example:
+ # COMPANY: MY COMPANY
+ regexp:
+ # define here regexp type values, for example
+ # AUTHOR: .*@mycompany\.com
+ template: # |-
+ # put here copyright header template for source code files, for example:
+ # Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
+ #
+ # {{ AUTHOR }} {{ COMPANY }} {{ YEAR }}
+ # SPDX-License-Identifier: Apache-2.0
+
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at:
+
+ # http://www.apache.org/licenses/LICENSE-2.0
+
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ template-path:
+ # also as alternative of directive 'template' you may put the path to file with the template source
goimports:
# put imports beginning with prefix after 3rd-party packages;
# it's a comma-separated list of prefixes
- local-prefixes: github.com/org/project
+ local-prefixes: github.com/OpenIMSDK/OpenKF
golint:
# minimal confidence for issues, default is 0.8
min-confidence: 0.9
@@ -111,16 +342,91 @@ linters-settings:
mnd:
# the list of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
checks: argument,case,condition,operation,return,assign
+ # ignored-numbers: 1000
+ # ignored-files: magic_.*.go
+ # ignored-functions: math.*
+ gomoddirectives:
+ # Allow local `replace` directives. Default is false.
+ replace-local: true
+ # List of allowed `replace` directives. Default is empty.
+ replace-allow-list:
+ - google.golang.org/grpc
+
+ # Allow to not explain why the version has been retracted in the `retract` directives. Default is false.
+ retract-allow-no-explanation: false
+ # Forbid the use of the `exclude` directives. Default is false.
+ exclude-forbidden: false
gomodguard:
allowed:
- modules: # List of allowed modules
+ modules:
+ - gorm.io/gen # List of allowed modules
+ - gorm.io/gorm
+ - gorm.io/driver/mysql
+ - k8s.io/klog
# - gopkg.in/yaml.v2
domains: # List of allowed module domains
- # - golang.org
+ - google.golang.org
+ - gopkg.in
+ - golang.org
+ - github.com
+ - go.uber.org
+ - go.etcd.io
+ blocked:
+ versions:
+ - github.com/MakeNowJust/heredoc:
+ version: "> 2.0.9"
+ reason: "use the latest version"
+ local_replace_directives: false # Set to true to raise lint issues for packages that are loaded from a local path via replace directive
+
+ gosec:
+ # To select a subset of rules to run.
+ # Available rules: https://github.com/securego/gosec#available-rules
+ includes:
+ - G401
+ - G306
+ - G101
+ # To specify a set of rules to explicitly exclude.
+ # Available rules: https://github.com/securego/gosec#available-rules
+ excludes:
+ - G204
+ # Exclude generated files
+ exclude-generated: true
+ # Filter out the issues with a lower severity than the given value. Valid options are: low, medium, high.
+ severity: "low"
+ # Filter out the issues with a lower confidence than the given value. Valid options are: low, medium, high.
+ confidence: "low"
+ # To specify the configuration of rules.
+ # The configuration of rules is not fully documented by gosec:
+ # https://github.com/securego/gosec#configuration
+ # https://github.com/securego/gosec/blob/569328eade2ccbad4ce2d0f21ee158ab5356a5cf/rules/rulelist.go#L60-L102
+ config:
+ G306: "0600"
+ G101:
+ pattern: "(?i)example"
+ ignore_entropy: false
+ entropy_threshold: "80.0"
+ per_char_threshold: "3.0"
+ truncate: "32"
+
+ gosimple:
+ # Select the Go version to target. The default is '1.13'.
+ go: "1.20"
+ # https://staticcheck.io/docs/options#checks
+ checks: [ "all" ]
+
govet:
# report about shadowed variables
check-shadowing: true
+ # settings per analyzer
+ settings:
+ printf: # analyzer name, run `go tool vet help` to see all analyzers
+ funcs: # run `go tool vet help printf` to see available settings for `printf` analyzer
+ - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+ - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+ - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+ - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+
# enable or disable analyzers by name
enable:
- atomicalign
@@ -128,17 +434,69 @@ linters-settings:
disable:
- shadow
disable-all: false
- depguard:
- list-type: blacklist
- include-go-root: false
- packages:
- packages-with-error-message:
+ # depguard:
+ # list-type: blacklist
+ # include-go-root: false
+ # packages:
+ # - github.com/Sirupsen/logrus
+ # packages-with-error-message:
+ # # specify an error message to output when a blacklisted package is used
+ # - github.com/Sirupsen/logrus: "logging is allowed only by logutils.Log"
+ ifshort:
+ # Maximum length of variable declaration measured in number of lines, after which linter won't suggest using short syntax.
+ # Has higher priority than max-decl-chars.
+ max-decl-lines: 1
+ # Maximum length of variable declaration measured in number of characters, after which linter won't suggest using short syntax.
+ max-decl-chars: 30
+
+ importas:
+ # if set to `true`, force to use alias.
+ no-unaliased: true
+ # List of aliases
+ alias:
+ # using `servingv1` alias for `knative.dev/serving/pkg/apis/serving/v1` package
+ - pkg: knative.dev/serving/pkg/apis/serving/v1
+ alias: servingv1
+ # using `autoscalingv1alpha1` alias for `knative.dev/serving/pkg/apis/autoscaling/v1alpha1` package
+ - pkg: knative.dev/serving/pkg/apis/autoscaling/v1alpha1
+ alias: autoscalingv1alpha1
+ # You can specify the package path by regular expression,
+ # and alias by regular expression expansion syntax like below.
+ # see https://github.com/julz/importas#use-regular-expression for details
+ - pkg: knative.dev/serving/pkg/apis/(\w+)/(v[\w\d]+)
+ alias: $1$2
+ # using `jwt` alias for `github.com/appleboy/gin-jwt/v2` package
+ jwt: github.com/appleboy/gin-jwt/v2
+
+ ireturn:
+ # ireturn allows using `allow` and `reject` settings at the same time.
+ # Both settings are lists of the keywords and regular expressions matched to interface or package names.
+ # keywords:
+ # - `empty` for `interface{}`
+ # - `error` for errors
+ # - `stdlib` for standard library
+ # - `anon` for anonymous interfaces
+
+ # By default, it allows using errors, empty interfaces, anonymous interfaces,
+ # and interfaces provided by the standard library.
+ allow:
+ - anon
+ - error
+ - empty
+ - stdlib
+ # You can specify idiomatic endings for interface
+ - (or|er)$
+
+ # Reject patterns
+ reject:
+ - github.com\/user\/package\/v4\.Type
+
lll:
# max line length, lines longer will be reported. Default is 120.
# '\t' is counted as 1 character by default, and can be changed with the tab-width option
- line-length: 120
+ line-length: 240
# tab width in spaces. Default to 1.
- tab-width: 1
+ tab-width: 4
maligned:
# print struct with more effective memory layout or not, false by default
suggest-new: true
@@ -152,26 +510,137 @@ linters-settings:
nakedret:
# make an issue if func has more lines of code than this setting and it has naked returns; default is 30
max-func-lines: 30
- prealloc:
- # XXX: we don't recommend using this linter before doing performance profiling.
- # For most programs usage of prealloc will be a premature optimization.
- # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them.
- # True by default.
- simple: true
- range-loops: true # Report preallocation suggestions on range loops, true by default
- for-loops: false # Report preallocation suggestions on for loops, false by default
+ nestif:
+ # minimal complexity of if statements to report, 5 by default
+ min-complexity: 4
+
+ nilnil:
+ # By default, nilnil checks all returned types below.
+ checked-types:
+ - ptr
+ - func
+ - iface
+ - map
+ - chan
+
+ nlreturn:
+ # size of the block (including return statement that is still "OK")
+ # so no return split required.
+ block-size: 1
+
nolintlint:
- # Enable to ensure that nolint directives are all used. Default is true.
+ # Disable to ensure that all nolint directives actually have an effect. Default is true.
allow-unused: false
# Disable to ensure that nolint directives don't have a leading space. Default is true.
allow-leading-space: true
# Exclude following linters from requiring an explanation. Default is [].
- allow-no-explanation: []
+ allow-no-explanation: [ ]
# Enable to require an explanation of nonzero length after each nolint directive. Default is false.
- require-explanation: true
+ require-explanation: false
# Enable to require nolint directives to mention the specific linter being suppressed. Default is false.
require-specific: true
+
+ prealloc:
+ # XXX: we don't recommend using this linter before doing performance profiling.
+ # For most programs usage of prealloc will be a premature optimization.
+
+ # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them.
+ # True by default.
+ simple: true
+ range-loops: true # Report preallocation suggestions on range loops, true by default
+ for-loops: false # Report preallocation suggestions on for loops, false by default
+
+ promlinter:
+ # Promlinter cannot infer all metrics name in static analysis.
+ # Enable strict mode will also include the errors caused by failing to parse the args.
+ strict: false
+ # Please refer to https://github.com/yeya24/promlinter#usage for detailed usage.
+ disabled-linters:
+ # - "Help"
+ # - "MetricUnits"
+ # - "Counter"
+ # - "HistogramSummaryReserved"
+ # - "MetricTypeInName"
+ # - "ReservedChars"
+ # - "CamelCase"
+ # - "lintUnitAbbreviations"
+
+ predeclared:
+ # comma-separated list of predeclared identifiers to not report on
+ ignore: ""
+ # include method names and field names (i.e., qualified names) in checks
+ q: false
+ rowserrcheck:
+ packages:
+ - github.com/jmoiron/sqlx
+ revive:
+ # see https://github.com/mgechev/revive#available-rules for details.
+ ignore-generated-header: true
+ severity: warning
+ rules:
+ - name: indent-error-flow
+ severity: warning
+ staticcheck:
+ # Select the Go version to target. The default is '1.13'.
+ go: "1.16"
+ # https://staticcheck.io/docs/options#checks
+ checks: [ "all" ]
+
+ stylecheck:
+ # Select the Go version to target. The default is '1.13'.
+ go: "1.16"
+
+ # https://staticcheck.io/docs/options#checks
+ checks: [ "all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022" ]
+ # https://staticcheck.io/docs/options#dot_import_whitelist
+ dot-import-whitelist:
+ - fmt
+ # https://staticcheck.io/docs/options#initialisms
+ initialisms: [ "ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS" ]
+ # https://staticcheck.io/docs/options#http_status_code_whitelist
+ http-status-code-whitelist: [ "200", "400", "404", "500" ]
+
+
+ tagliatelle:
+ # check the struck tag name case
+ case:
+ # use the struct field name to check the name of the struct tag
+ use-field-name: true
+ rules:
+ # any struct tag type can be used.
+ # support string case: `camel`, `pascal`, `kebab`, `snake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`
+ json: camel
+ yaml: camel
+ xml: camel
+ bson: camel
+ avro: snake
+ mapstructure: kebab
+
+ testpackage:
+ # regexp pattern to skip files
+ skip-regexp: (id|export|internal)_test\.go
+ thelper:
+ # The following configurations enable all checks. It can be omitted because all checks are enabled by default.
+ # You can enable only required checks deleting unnecessary checks.
+ test:
+ first: true
+ name: true
+ begin: true
+ benchmark:
+ first: true
+ name: true
+ begin: true
+ tb:
+ first: true
+ name: true
+ begin: true
+
+ tenv:
+ # The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.
+ # By default, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
+ all: false
+
unparam:
# Inspect exported functions, default is false. Set to true if no external program/library imports your code.
# XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
@@ -187,6 +656,24 @@ linters-settings:
whitespace:
multi-if: false # Enforces newlines (or comments) after every multi-line if statement
multi-func: false # Enforces newlines (or comments) after every multi-line function signature
+
+ wrapcheck:
+ # An array of strings that specify substrings of signatures to ignore.
+ # If this set, it will override the default set of ignored signatures.
+ # See https://github.com/tomarrell/wrapcheck#configuration for more information.
+ ignoreSigs:
+ - .Errorf(
+ - errors.New(
+ - errors.Unwrap(
+ - .Wrap(
+ - .Wrapf(
+ - .WithMessage(
+ - .WithMessagef(
+ - .WithStack(
+ ignorePackageGlobs:
+ - encoding/*
+ - github.com/pkg/*
+
wsl:
# If true append is only allowed to be cuddled if appending value is
# matching variables, fields or types on line above. Default is true.
@@ -194,6 +681,8 @@ linters-settings:
# Allow calls and assignments to be cuddled as long as the lines have any
# matching variables, fields or types. Default is true.
allow-assign-and-call: true
+ # Allow assignments to be cuddled with anything. Default is false.
+ allow-assign-and-anything: false
# Allow multiline assignments to be cuddled. Default is true.
allow-multiline-assign: true
# Allow declarations (var) to be cuddled.
@@ -206,65 +695,181 @@ linters-settings:
force-err-cuddling: false
# Allow leading comments to be separated with empty liens
allow-separated-leading-comment: false
+ makezero:
+ # Allow only slices initialized with a length of zero. Default is false.
+ always: false
+
+
+ # The custom section can be used to define linter plugins to be loaded at runtime. See README doc
+ # for more info.
+ #custom:
+ # Each custom linter should have a unique name.
+ #example:
+ # The path to the plugin *.so. Can be absolute or local. Required for each custom linter
+ #path: /path/to/example.so
+ # The description of the linter. Optional, just for documentation purposes.
+ #description: This is an example usage of a plugin linter.
+ # Intended to point to the repo location of the linter. Optional, just for documentation purposes.
+ #original-url: github.com/golangci/example-linter
linters:
# please, do not use `enable-all`: it's deprecated and will be removed soon.
# inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
+ # enable-all: true
disable-all: true
enable:
+ - typecheck
+ - asciicheck
- bodyclose
+ - cyclop
- deadcode
- - depguard
+ # - depguard
- dogsled
- dupl
+ - durationcheck
- errcheck
+ - errorlint
+ - exhaustive
+ - exportloopref
+ # - forbidigo
- funlen
- - gochecknoinits
+ # - gci
+ # - gochecknoinits
+ - gocognit
- goconst
- - gocritic
- gocyclo
+ - godot
+ - godox
- gofmt
+ - gofumpt
+ - goheader
- goimports
- - golint
+ - gomoddirectives
+ - gomodguard
- goprintffuncname
- gosec
- gosimple
- govet
+ - ifshort
+ - importas
- ineffassign
- - interfacer
- lll
+ - makezero
- misspell
- nakedret
+ - nestif
+ - nilerr
+ - nlreturn
+ - noctx
- nolintlint
+ - paralleltest
+ - prealloc
+ - predeclared
+ - promlinter
+ - revive
- rowserrcheck
- - scopelint
+ - sqlclosecheck
- staticcheck
- structcheck
- stylecheck
- - typecheck
+ - thelper
+ - tparallel
- unconvert
- unparam
- unused
- varcheck
+ - wastedassign
- whitespace
- - asciicheck
- - gocognit
- - godot
- - godox
- - maligned
- - nestif
- - prealloc
- - gomodguard
- # don't enable:
- #- goerr113
- #- wsl
- #- testpackage
- #- exhaustive (TODO: enable after next release; current release at time of writing is v1.27)
- #- gochecknoglobals
- #- gomnd
+ - bidichk
+ - wastedassign
+ - golint
+ - execinquery
+ - nosprintfhostport
+ - grouper
+ - decorder
+ - errchkjson
+ - maintidx
+ #- containedctx
+ #- tagliatelle
+ #- nonamedreturns
+ #- nilnil
+ #- tenv
+ #- varnamelen
+ #- contextcheck
+ #- errname
+ #- ForceTypeAssert
+ #- nilassign
+ fast: false
issues:
+ # List of regexps of issue texts to exclude, empty list by default.
+ # But independently from this option we use default exclude patterns,
+ # it can be disabled by `exclude-use-default: false`. To list all
+ # excluded by default patterns execute `golangci-lint run --help`
+ exclude:
+ - tools/.*
+ - test/.*
+ - third_party/.*
+
# Excluding configuration per-path, per-linter, per-text and per-source
+ exclude-rules:
+ - linters:
+ - golint
+ path: (internal/api/.*)\.go # exclude golint for internal/api/... files
+
+ - linters:
+ - revive
+ path: (log/.*)\.go
+
+ - linters:
+ - wrapcheck
+ path: (cmd/.*|pkg/.*)\.go
+
+ - linters:
+ - typecheck
+ #path: (pkg/storage/.*)\.go
+ path: (internal/.*|pkg/.*)\.go
+
+ - path: (cmd/.*|test/.*|tools/.*|internal/pump/pumps/.*)\.go
+ linters:
+ - forbidigo
+
+ - path: (cmd/[a-z]*/.*|store/.*)\.go
+ linters:
+ - dupl
+
+ - linters:
+ - gocritic
+ text: (hugeParam:|rangeValCopy:)
+
+ - path: (cmd/[a-z]*/.*)\.go
+ linters:
+ - lll
+
+ - path: (validator/.*|code/.*|validator/.*|watcher/watcher/.*)
+ linters:
+ - gochecknoinits
+
+ - path: (internal/.*/options|internal/pump|pkg/log/options.go|internal/authzserver|tools/)
+ linters:
+ - tagliatelle
+
+ - path: (pkg/app/.*)\.go
+ linters:
+ - deadcode
+ - unused
+ - varcheck
+ - forbidigo
+
+ # Exclude some staticcheck messages
+ - linters:
+ - staticcheck
+ text: "SA9003:"
+
+ # Exclude lll issues for long lines with go:generate
+ - linters:
+ - lll
+ source: "^//go:generate "
# Independently from option `exclude` we use default exclude patterns,
# it can be disabled by this option. To list all
@@ -300,24 +905,27 @@ issues:
# Show only new issues created in git patch with set file path.
#new-from-patch: path/to/patch/file
+ # Fix found issues (if it's supported by the linter)
+ fix: true
+
severity:
# Default value is empty string.
- # Set the default severity for issues. If severity rules are defined and the issues
- # do not match or no severity is provided to the rule this will be the default
- # severity applied. Severities should match the supported severity names of the
+ # Set the default severity for issues. If severity rules are defined and the issues
+ # do not match or no severity is provided to the rule this will be the default
+ # severity applied. Severities should match the supported severity names of the
# selected out format.
# - Code climate: https://docs.codeclimate.com/docs/issues#issue-severity
# - Checkstyle: https://checkstyle.sourceforge.io/property_types.html#severity
# - Github: https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message
default-severity: error
- # The default value is false.
+ # The default value is false.
# If set to true severity-rules regular expressions become case sensitive.
case-sensitive: false
# Default value is empty list.
# When a list of severity rules are provided, severity information will be added to lint
- # issues. Severity rules have the same filtering capability as exclude rules except you
+ # issues. Severity rules have the same filtering capability as exclude rules except you
# are allowed to specify one matcher per severity rule.
# Only affects out formats that support setting severity information.
rules:
diff --git a/CHANGELOG/CHANGELOG-3.0.md b/CHANGELOG/CHANGELOG-3.0.md
index 72cc56bbf..cf1aa4b62 100644
--- a/CHANGELOG/CHANGELOG-3.0.md
+++ b/CHANGELOG/CHANGELOG-3.0.md
@@ -1,23 +1,9 @@
# Version logging for OpenIM
-**3.0 Major refactoring**
-
-
- [Version logging for OpenIM](#version-logging-for-openim)
- - [\[v3.0\]](#v30)
- - [v3.0.0 - 2023-07-10](#v300---2023-07-10)
- - [v2.9.0+1.839643f - 2023-07-07](#v2901839643f---2023-07-07)
- - [v2.9.0+2.35f07fe - 2023-07-06](#v290235f07fe---2023-07-06)
- - [v2.9.0+1.b5072b1 - 2023-07-05](#v2901b5072b1---2023-07-05)
- - [v2.9.0+3.2667a3a - 2023-07-05](#v29032667a3a---2023-07-05)
- - [v2.9.0+7.04818ca - 2023-07-05](#v290704818ca---2023-07-05)
+ - [Unreleased](#unreleased)
- [v2.9.0 - 2023-07-04](#v290---2023-07-04)
- - [v0.0.0+1.3714b4f - 2023-07-04](#v00013714b4f---2023-07-04)
- - [v0.0.0+635.8b92c90 - 2023-07-04](#v0006358b92c90---2023-07-04)
- - [v0.0.0+1.78a6d03 - 2023-07-04](#v000178a6d03---2023-07-04)
- - [v0.0.0+2.e057c18 - 2023-07-04](#v0002e057c18---2023-07-04)
- - [v0.0.0+630.b55ac4a - 2023-07-04](#v000630b55ac4a---2023-07-04)
- [Reverts](#reverts)
- [Pull Requests](#pull-requests)
- [v2.3.3 - 2022-09-18](#v233---2022-09-18)
@@ -32,17 +18,15 @@
- [v2.0.9 - 2022-04-29](#v209---2022-04-29)
- [Reverts](#reverts-1)
- [Pull Requests](#pull-requests-2)
- - [v2.0.8 - 2022-04-24](#v208---2022-04-24)
- - [Pull Requests](#pull-requests-3)
- [v2.0.7 - 2022-04-08](#v207---2022-04-08)
- - [Pull Requests](#pull-requests-4)
+ - [Pull Requests](#pull-requests-3)
- [v2.0.6 - 2022-04-01](#v206---2022-04-01)
- - [Pull Requests](#pull-requests-5)
+ - [Pull Requests](#pull-requests-4)
- [v2.0.5 - 2022-03-24](#v205---2022-03-24)
- [v2.04 - 2022-03-18](#v204---2022-03-18)
- [v2.0.3 - 2022-03-11](#v203---2022-03-11)
- [v2.0.2 - 2022-03-04](#v202---2022-03-04)
- - [Pull Requests](#pull-requests-6)
+ - [Pull Requests](#pull-requests-5)
- [v2.0.1 - 2022-02-25](#v201---2022-02-25)
- [v2.0.0 - 2022-02-23](#v200---2022-02-23)
- [v1.0.7 - 2021-12-17](#v107---2021-12-17)
@@ -54,48 +38,14 @@
- [v1.0.0 - 2021-10-28](#v100---2021-10-28)
- [Reverts](#reverts-2)
-
-## [v3.0]
-
-
-
-## [v3.0.0] - 2023-07-10
-
-
-## [v2.9.0+1.839643f] - 2023-07-07
+## [Unreleased]
-
-## [v2.9.0+2.35f07fe] - 2023-07-06
-
-
-## [v2.9.0+1.b5072b1] - 2023-07-05
-
-
-## [v2.9.0+3.2667a3a] - 2023-07-05
-
-
-## [v2.9.0+7.04818ca] - 2023-07-05
## [v2.9.0] - 2023-07-04
-
-
-## [v0.0.0+1.3714b4f] - 2023-07-04
-
-
-## [v0.0.0+635.8b92c90] - 2023-07-04
-
-
-## [v0.0.0+1.78a6d03] - 2023-07-04
-
-
-## [v0.0.0+2.e057c18] - 2023-07-04
-
-
-## [v0.0.0+630.b55ac4a] - 2023-07-04
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
@@ -144,11 +94,6 @@
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
-
-
-
-## [v2.0.8] - 2022-04-24
-### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
@@ -216,19 +161,8 @@
- update
-[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.0.0...HEAD
-[v3.0.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.839643f...v3.0.0
-[v2.9.0+1.839643f]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+2.35f07fe...v2.9.0+1.839643f
-[v2.9.0+2.35f07fe]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.b5072b1...v2.9.0+2.35f07fe
-[v2.9.0+1.b5072b1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+3.2667a3a...v2.9.0+1.b5072b1
-[v2.9.0+3.2667a3a]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+7.04818ca...v2.9.0+3.2667a3a
-[v2.9.0+7.04818ca]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...v2.9.0+7.04818ca
-[v2.9.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+1.3714b4f...v2.9.0
-[v0.0.0+1.3714b4f]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+635.8b92c90...v0.0.0+1.3714b4f
-[v0.0.0+635.8b92c90]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+1.78a6d03...v0.0.0+635.8b92c90
-[v0.0.0+1.78a6d03]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+2.e057c18...v0.0.0+1.78a6d03
-[v0.0.0+2.e057c18]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+630.b55ac4a...v0.0.0+2.e057c18
-[v0.0.0+630.b55ac4a]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...v0.0.0+630.b55ac4a
+[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...HEAD
+[v2.9.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...v2.9.0
[v2.3.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3
[v2.3.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2
[v2.3.0-rc2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2
@@ -237,8 +171,7 @@
[v2.2.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...v2.2.0
[v2.1.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...v2.1.0
[v2.0.10]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.9...v2.0.10
-[v2.0.9]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.8...v2.0.9
-[v2.0.8]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.8
+[v2.0.9]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.9
[v2.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.6...v2.0.7
[v2.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.5...v2.0.6
[v2.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.04...v2.0.5
diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md
index 39ed572db..2d788d4c4 100644
--- a/CHANGELOG/CHANGELOG.md
+++ b/CHANGELOG/CHANGELOG.md
@@ -1,5 +1,16 @@
# Changelog
+- [Changelog](#changelog)
+ - [command](#command)
+ - [create next tag](#create-next-tag)
+ - [Release version logs](#release-version-logs)
+ - [Introduction](#introduction)
+ - [Naming Format](#naming-format)
+ - [Examples](#examples)
+ - [Version Modifiers](#version-modifiers)
+ - [Versioning Strategy](#versioning-strategy)
+
+
All notable changes to this project will be documented in this file.
+ [https://github.com/OpenIMSDK/Open-IM-Server/releases](https://github.com/OpenIMSDK/Open-IM-Server/releases)
@@ -18,6 +29,14 @@ git commit -am "release 2.0.0"
git tag 2.0.0
```
+| Query | Description | Example |
+| -------------- | ---------------------------------------------- | --------------------------- |
+| `..` | Commit contained in `` tags from ``. | `$ git-chglog 1.0.0..2.0.0` |
+| `..` | Commit from the `` to the latest tag. | `$ git-chglog 1.0.0..` |
+| `..` | Commit from the oldest tag to ``. | `$ git-chglog ..2.0.0` |
+| `` | Commit contained in ``. | `$ git-chglog 1.0.0` |
+
+
## Release version logs
+ [OpenIM CHANGELOG-V1.0](CHANGELOG-1.0.md)
@@ -26,4 +45,60 @@ git tag 2.0.0
+ [OpenIM CHANGELOG-V2.2](CHANGELOG-2.2.md)
+ [OpenIM CHANGELOG-V2.3](CHANGELOG-2.3.md)
+ [OpenIM CHANGELOG-V2.9](CHANGELOG-2.9.md)
-+ [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md)
\ No newline at end of file
++ [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md)
+
+## Introduction
+
+In both the open-source and closed-source software development communities, it is important to follow a consistent and understandable versioning scheme for software projects. This ensures clear communication of changes, compatibility, and stability across different releases. One widely adopted naming convention is the Semantic Versioning 2.0.0.
+
+## Naming Format
+
+The most common format for version numbers is as follows:
+
+```
+major.minor[.patch[.build]]
+```
+
+Let's take a closer look at each component:
+
+1. **Major Version**: This is the first number in the versioning scheme and indicates significant changes that may not be backward compatible (specific to each project).
+2. **Minor Version**: The second number signifies the addition of new features while maintaining backward compatibility.
+3. **Patch Version**: The third number represents bug fixes or code optimizations without introducing new features. It is generally backward compatible.
+4. **Build Version**: Typically an automatically generated number that increments with each code commit.
+
+## Examples
+
+Here are a few examples to illustrate the versioning scheme:
+
+1. `1.0`
+2. `2.14.0.1478`
+3. `3.2.1 build-354`
+
+## Version Modifiers
+
+Apart from the version numbers, there are also version modifiers used to indicate specific stages or statuses of a release. Some commonly used version modifiers include:
+
+- **alpha**: An internal testing version with numerous known bugs. It is primarily used for communication among developers.
+- **beta**: A testing version released to enthusiastic users for feedback and bug detection.
+- **rc (release candidate)**: The final testing version before the official release.
+- **ga (general availability)**: The initial stable release for public distribution.
+- **r/release** (or no modifier at all): The final released version intended for general users.
+- **lts (long-term support)**: Designates a version that will receive extended maintenance and bug fixes for a specified number of years.
+
+## Versioning Strategy
+
+To effectively manage version numbers, the following strategies are commonly employed:
+
+- The initial version of a project can be either `0.1` or `1.0`.
+- When fixing bugs, the patch version is incremented by 1.
+- When adding new features, the minor version is incremented by 1, and the patch version is reset to 0.
+- In the case of significant modifications, the major version is incremented by 1.
+- The build version is usually automatically generated by the compilation process and follows a defined format. It does not require manual control.
+
+By adhering to these strategies and guidelines, developers can maintain consistency and clarity in versioning their software projects. This enables users and collaborators to understand the nature of changes between different releases and ensure compatibility with their systems.
+
+(Note: Markdown formatting has been used to structure this article. Markdown is a lightweight markup language used to format text on platforms like GitHub.)
+
+------
+
+**Note**: The above article is based on the given content and aims to provide a Markdown-formatted English article explaining the naming conventions for software project versions, specifically focusing on the Semantic Versioning 2.0.0.
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 5df672921..579c0c1d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts
#Copy scripts files and binary files to the blank image
COPY --from=build /Open-IM-Server/scripts /Open-IM-Server/scripts
-COPY --from=build /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-Server/_output/bin/platforms/linux/amd64
+COPY --from=build /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-Server/_output/bin/platforms/linux/amd64
WORKDIR /Open-IM-Server/scripts
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c78e4a63b..cea3b1480 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -100,7 +100,7 @@ services:
openim_server:
- image: ghcr.io/openimsdk/openim-server:v3.0.0
+ image: ghcr.io/openimsdk/openim-server:v3.0.0-alpha.0
container_name: openim-server
volumes:
- ./logs:/Open-IM-Server/logs
diff --git a/install_im_server.sh b/install_im_server.sh
index b08597e80..c526d43db 100644
--- a/install_im_server.sh
+++ b/install_im_server.sh
@@ -9,6 +9,10 @@ source .env
echo $MINIO_ENDPOINT
# Replace local IP address with the public IP address in .env file
+if [ $API_URL == "http://127.0.0.1:10002/object/" ]; then
+ sed -i "s/127.0.0.1/${internet_ip}/" .env
+fi
+
if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
sed -i "s/127.0.0.1/${internet_ip}/" .env
fi
diff --git a/internal/api/group.go b/internal/api/group.go
index 2e293f72a..a87af8e6b 100644
--- a/internal/api/group.go
+++ b/internal/api/group.go
@@ -132,3 +132,6 @@ func (o *GroupApi) GetSuperGroupsInfo(c *gin.Context) {
func (o *GroupApi) GroupCreateCount(c *gin.Context) {
a2r.Call(group.GroupClient.GroupCreateCount, o.Client, c)
}
+func (o *GroupApi) GetGroups(c *gin.Context) {
+ a2r.Call(group.GroupClient.GetGroups, o.Client, c)
+}
diff --git a/internal/api/msg.go b/internal/api/msg.go
index 7e9101681..45a551cc2 100644
--- a/internal/api/msg.go
+++ b/internal/api/msg.go
@@ -15,6 +15,7 @@
package api
import (
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/user"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
"github.com/mitchellh/mapstructure"
@@ -204,7 +205,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
if err := mapstructure.WeakDecode(params.Content, &data); err != nil {
apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
return
- } else if err := m.validate.Struct(data); err != nil {
+ } else if err := m.validate.Struct(params); err != nil {
apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
return
}
@@ -227,7 +228,107 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
}
func (m *MessageApi) ManagementBatchSendMsg(c *gin.Context) {
- a2r.Call(msg.MsgClient.SendMsg, m.Client, c)
+ params := apistruct.ManagementBatchSendMsgReq{}
+ resp := apistruct.ManagementBatchSendMsgResp{}
+ var msgSendFailedFlag bool
+ if err := c.BindJSON(¶ms); err != nil {
+ apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
+ return
+ }
+ if !tokenverify.IsAppManagerUid(c) {
+ apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
+ return
+ }
+
+ var data interface{}
+ switch params.ContentType {
+ case constant.Text:
+ data = apistruct.TextElem{}
+ case constant.Picture:
+ data = apistruct.PictureElem{}
+ case constant.Voice:
+ data = apistruct.SoundElem{}
+ case constant.Video:
+ data = apistruct.VideoElem{}
+ case constant.File:
+ data = apistruct.FileElem{}
+ case constant.Custom:
+ data = apistruct.CustomElem{}
+ case constant.Revoke:
+ data = apistruct.RevokeElem{}
+ case constant.OANotification:
+ data = apistruct.OANotificationElem{}
+ params.SessionType = constant.NotificationChatType
+ case constant.CustomNotTriggerConversation:
+ data = apistruct.CustomElem{}
+ case constant.CustomOnlineOnly:
+ data = apistruct.CustomElem{}
+ default:
+ apiresp.GinError(c, errs.ErrArgs.WithDetail("not support err contentType").Wrap())
+ return
+ }
+ if err := mapstructure.WeakDecode(params.Content, &data); err != nil {
+ apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+ return
+ } else if err := m.validate.Struct(params); err != nil {
+ apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+ return
+ }
+
+ t := &apistruct.ManagementSendMsgReq{
+ SendID: params.SendID,
+ GroupID: params.GroupID,
+ SenderNickname: params.SenderNickname,
+ SenderFaceURL: params.SenderFaceURL,
+ SenderPlatformID: params.SenderPlatformID,
+ Content: params.Content,
+ ContentType: params.ContentType,
+ SessionType: params.SessionType,
+ IsOnlineOnly: params.IsOnlineOnly,
+ NotOfflinePush: params.NotOfflinePush,
+ OfflinePushInfo: params.OfflinePushInfo,
+ }
+ pbReq := m.newUserSendMsgReq(c, t)
+ var recvList []string
+ if params.IsSendAll {
+ req2 := &user.GetAllUserIDReq{}
+ resp2, err := m.Message.GetAllUserID(c, req2)
+ if err != nil {
+ apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+ return
+ }
+ recvList = resp2.UserIDs
+ } else {
+ recvList = params.RecvIDList
+ }
+
+ for _, recvID := range recvList {
+ pbReq.MsgData.RecvID = recvID
+ rpcResp, err := m.Client.SendMsg(c, pbReq)
+ if err != nil {
+ resp.Data.FailedIDList = append(resp.Data.FailedIDList, recvID)
+ msgSendFailedFlag = true
+ continue
+ }
+ resp.Data.ResultList = append(resp.Data.ResultList, &apistruct.SingleReturnResult{
+ ServerMsgID: rpcResp.ServerMsgID,
+ ClientMsgID: rpcResp.ClientMsgID,
+ SendTime: rpcResp.SendTime,
+ RecvID: recvID,
+ })
+ }
+ var status int32
+ if msgSendFailedFlag {
+ status = constant.MsgSendFailed
+ } else {
+ status = constant.MsgSendSuccessed
+ }
+ _, err := m.Client.SetSendMsgStatus(c, &msg.SetSendMsgStatusReq{Status: status})
+ if err != nil {
+ apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+ return
+ }
+ apiresp.GinSuccess(c, resp)
}
func (m *MessageApi) CheckMsgIsSendSuccess(c *gin.Context) {
@@ -245,3 +346,11 @@ func (m *MessageApi) GetActiveUser(c *gin.Context) {
func (m *MessageApi) GetActiveGroup(c *gin.Context) {
a2r.Call(msg.MsgClient.GetActiveGroup, m.Client, c)
}
+
+func (m *MessageApi) SearchMsg(c *gin.Context) {
+ a2r.Call(msg.MsgClient.SearchMessage, m.Client, c)
+}
+
+func (m *MessageApi) ManagementMsg(c *gin.Context) {
+ a2r.Call(msg.MsgClient.ManageMsg, m.Client, c)
+}
diff --git a/internal/api/route.go b/internal/api/route.go
index b37e5a3f7..273386853 100644
--- a/internal/api/route.go
+++ b/internal/api/route.go
@@ -103,6 +103,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
groupRouterGroup.POST("/cancel_mute_group", g.CancelMuteGroup)
groupRouterGroup.POST("/set_group_member_info", g.SetGroupMemberInfo)
groupRouterGroup.POST("/get_group_abstract_info", g.GetGroupAbstractInfo)
+ groupRouterGroup.POST("/get_groups", g.GetGroups)
}
superGroupRouterGroup := r.Group("/super_group", ParseToken)
{
@@ -124,6 +125,8 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
thirdGroup.POST("/fcm_update_token", t.FcmUpdateToken)
thirdGroup.POST("/set_app_badge", t.SetAppBadge)
+ thirdGroup.POST("/minio_upload", t.MinioUploadFile)
+
objectGroup := r.Group("/object", ParseToken)
objectGroup.POST("/part_limit", t.PartLimit)
@@ -138,10 +141,12 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
msgGroup := r.Group("/msg", ParseToken)
{
msgGroup.POST("/newest_seq", m.GetSeq)
+ msgGroup.POST("/search_msg", m.SearchMsg)
msgGroup.POST("/send_msg", m.SendMessage)
msgGroup.POST("/pull_msg_by_seq", m.PullMsgBySeqs)
msgGroup.POST("/revoke_msg", m.RevokeMsg)
msgGroup.POST("/mark_msgs_as_read", m.MarkMsgsAsRead)
+ msgGroup.POST("/manage_msg", m.ManagementMsg)
msgGroup.POST("/mark_conversation_as_read", m.MarkConversationAsRead)
msgGroup.POST("/get_conversations_has_read_and_max_seq", m.GetConversationsHasReadAndMaxSeq)
msgGroup.POST("/set_conversation_has_read_seq", m.SetConversationHasReadSeq)
diff --git a/internal/api/third.go b/internal/api/third.go
index ad9475511..19beeeb11 100644
--- a/internal/api/third.go
+++ b/internal/api/third.go
@@ -1,16 +1,23 @@
package api
import (
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+ "github.com/minio/minio-go/v7"
+ "math/rand"
+ "net/http"
+ "strconv"
+
+ "github.com/gin-gonic/gin"
+
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third"
"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
- "github.com/gin-gonic/gin"
- "math/rand"
- "net/http"
- "strconv"
)
type ThirdApi rpcclient.Third
@@ -82,3 +89,57 @@ func (o *ThirdApi) ObjectRedirect(c *gin.Context) {
}
c.Redirect(http.StatusTemporaryRedirect, resp.Url)
}
+
+func (o *ThirdApi) MinioUploadFile(c *gin.Context) {
+ var (
+ req apistruct.MinioUploadFileReq
+ resp apistruct.MinioUploadFile
+ )
+
+ if err := c.Bind(&req); err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+ return
+ }
+ switch req.FileType {
+ // videoType upload snapShot
+ case constant.VideoType:
+ snapShotFile, err := c.FormFile("snapShot")
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "missing snapshot arg: " + err.Error()})
+ return
+ }
+ snapShotFileObj, err := snapShotFile.Open()
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+ return
+ }
+ snapShotNewName, snapShotNewType := utils.GetNewFileNameAndContentType(snapShotFile.Filename, constant.ImageType)
+ _, err = o.MinioClient.PutObject(c, config.Config.Object.Minio.Bucket, snapShotNewName, snapShotFileObj, snapShotFile.Size, minio.PutObjectOptions{ContentType: snapShotNewType})
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+ return
+ }
+ resp.SnapshotURL = config.Config.Object.Minio.Endpoint + "/" + config.Config.Object.Minio.Bucket + "/" + snapShotNewName
+ resp.SnapshotNewName = snapShotNewName
+ }
+ file, err := c.FormFile("file")
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "missing file arg: " + err.Error()})
+ return
+ }
+ fileObj, err := file.Open()
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "invalid file path" + err.Error()})
+ return
+ }
+ newName, newType := utils.GetNewFileNameAndContentType(file.Filename, req.FileType)
+ _, err = o.MinioClient.PutObject(c, config.Config.Object.Minio.Bucket, newName, fileObj, file.Size, minio.PutObjectOptions{ContentType: newType})
+ if err != nil {
+ c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "upload file error" + err.Error()})
+ return
+ }
+ resp.NewName = newName
+ resp.URL = config.Config.Object.Minio.Endpoint + "/" + config.Config.Object.Minio.Bucket + "/" + newName
+ c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
+ return
+}
diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go
index ec3e08d7c..34f9cf47d 100644
--- a/internal/msggateway/client.go
+++ b/internal/msggateway/client.go
@@ -21,13 +21,14 @@ import (
"runtime/debug"
"sync"
+ "google.golang.org/protobuf/proto"
+
"github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
- "google.golang.org/protobuf/proto"
)
var ErrConnClosed = errors.New("conn has closed")
@@ -80,7 +81,14 @@ func newClient(ctx *UserConnContext, conn LongConn, isCompress bool) *Client {
ctx: ctx,
}
}
-func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, isBackground, isCompress bool, longConnServer LongConnServer, token string) {
+
+func (c *Client) ResetClient(
+ ctx *UserConnContext,
+ conn LongConn,
+ isBackground, isCompress bool,
+ longConnServer LongConnServer,
+ token string,
+) {
c.w = new(sync.Mutex)
c.conn = conn
c.PlatformID = utils.StringToInt(ctx.GetPlatformID())
@@ -161,7 +169,9 @@ func (c *Client) handleMessage(message []byte) error {
if binaryReq.SendID != c.UserID {
return utils.Wrap(errors.New("exception conn userID not same to req userID"), binaryReq.String())
}
- ctx := mcontext.WithMustInfoCtx([]string{binaryReq.OperationID, binaryReq.SendID, constant.PlatformIDToName(c.PlatformID), c.ctx.GetConnID()})
+ ctx := mcontext.WithMustInfoCtx(
+ []string{binaryReq.OperationID, binaryReq.SendID, constant.PlatformIDToName(c.PlatformID), c.ctx.GetConnID()},
+ )
log.ZDebug(ctx, "gateway req message", "req", binaryReq.String())
var messageErr error
var resp []byte
@@ -179,7 +189,12 @@ func (c *Client) handleMessage(message []byte) error {
case WsSetBackgroundStatus:
resp, messageErr = c.setAppBackgroundStatus(ctx, binaryReq)
default:
- return fmt.Errorf("ReqIdentifier failed,sendID:%s,msgIncr:%s,reqIdentifier:%d", binaryReq.SendID, binaryReq.MsgIncr, binaryReq.ReqIdentifier)
+ return fmt.Errorf(
+ "ReqIdentifier failed,sendID:%s,msgIncr:%s,reqIdentifier:%d",
+ binaryReq.SendID,
+ binaryReq.MsgIncr,
+ binaryReq.ReqIdentifier,
+ )
}
c.replyMessage(ctx, &binaryReq, messageErr, resp)
return nil
diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go
index c07b1423c..4c528d1d1 100644
--- a/internal/rpc/friend/friend.go
+++ b/internal/rpc/friend/friend.go
@@ -246,7 +246,6 @@ func (s *friendServer) GetPaginationFriendsApplyTo(
req *pbfriend.GetPaginationFriendsApplyToReq,
) (resp *pbfriend.GetPaginationFriendsApplyToResp, err error) {
defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
- resp = &pbfriend.GetPaginationFriendsApplyToResp{}
if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
return nil, err
}
@@ -255,6 +254,7 @@ func (s *friendServer) GetPaginationFriendsApplyTo(
if err != nil {
return nil, err
}
+ resp = &pbfriend.GetPaginationFriendsApplyToResp{}
resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.userRpcClient.GetUsersInfoMap)
if err != nil {
return nil, err
diff --git a/internal/rpc/group/db_map.go b/internal/rpc/group/db_map.go
index 84c0e74a4..7940635bd 100644
--- a/internal/rpc/group/db_map.go
+++ b/internal/rpc/group/db_map.go
@@ -16,9 +16,10 @@ package group
import (
"context"
- "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
"time"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
+
pbGroup "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
)
diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go
index c95d347e7..8ad8d9d4a 100644
--- a/internal/rpc/msg/revoke.go
+++ b/internal/rpc/msg/revoke.go
@@ -124,3 +124,24 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
}
return &msg.RevokeMsgResp{}, nil
}
+
+func (m *msgServer) ManageMsg(ctx context.Context, req *msg.ManageMsgReq) (*msg.ManageMsgResp, error) {
+ resp := &msg.ManageMsgResp{}
+ msgData := &sdkws.MsgData{
+ SendID: req.SendID,
+ RecvID: req.RecvID,
+ SessionType: req.SessionType,
+ GroupID: req.GroupID,
+ }
+ conversationID := utils.GetChatConversationIDByMsg(msgData)
+ revokeReq := &msg.RevokeMsgReq{
+ ConversationID: conversationID,
+ Seq: req.Seq,
+ UserID: req.SendID,
+ }
+ _, err := m.RevokeMsg(ctx, revokeReq)
+ if err != nil {
+ return nil, err
+ }
+ return resp, nil
+}
diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go
index 909707703..17aac5040 100644
--- a/internal/rpc/msg/server.go
+++ b/internal/rpc/msg/server.go
@@ -2,6 +2,9 @@ package msg
import (
"context"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
+
+ "google.golang.org/grpc"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -13,7 +16,6 @@ import (
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
- "google.golang.org/grpc"
)
type MessageInterceptorChain []MessageInterceptorFunc
@@ -60,11 +62,13 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
}
cacheModel := cache.NewMsgCacheModel(rdb)
msgDocModel := unrelation.NewMsgMongoDriver(mongo.GetDatabase())
- msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, cacheModel)
conversationClient := rpcclient.NewConversationRpcClient(client)
userRpcClient := rpcclient.NewUserRpcClient(client)
groupRpcClient := rpcclient.NewGroupRpcClient(client)
friendRpcClient := rpcclient.NewFriendRpcClient(client)
+ mysql, err := relation.NewGormDB()
+ msgMysModel := relation.NewChatLogGorm(mysql)
+ msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, cacheModel, msgMysModel)
s := &msgServer{
Conversation: &conversationClient,
User: &userRpcClient,
@@ -100,7 +104,8 @@ func (m *msgServer) initPrometheus() {
}
func (m *msgServer) conversationAndGetRecvID(conversation *conversation.Conversation, userID string) (recvID string) {
- if conversation.ConversationType == constant.SingleChatType || conversation.ConversationType == constant.NotificationChatType {
+ if conversation.ConversationType == constant.SingleChatType ||
+ conversation.ConversationType == constant.NotificationChatType {
if userID == conversation.OwnerUserID {
recvID = conversation.UserID
} else {
diff --git a/internal/rpc/msg/sync_msg.go b/internal/rpc/msg/sync_msg.go
index 7ac30ff1a..01510ffef 100644
--- a/internal/rpc/msg/sync_msg.go
+++ b/internal/rpc/msg/sync_msg.go
@@ -16,6 +16,8 @@ package msg
import (
"context"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
@@ -102,3 +104,50 @@ func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sd
resp.MaxSeqs = maxSeqs
return resp, nil
}
+
+func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq) (resp *msg.SearchMessageResp, err error) {
+ var chatLogs []*sdkws.MsgData
+ resp = &msg.SearchMessageResp{}
+ if chatLogs, err = m.MsgDatabase.SearchMessage(ctx, req); err != nil {
+ return nil, err
+ }
+ var num int
+ for _, chatLog := range chatLogs {
+ pbChatLog := &msg.ChatLog{}
+ utils.CopyStructFields(pbChatLog, chatLog)
+ pbChatLog.SendTime = chatLog.SendTime
+ pbChatLog.CreateTime = chatLog.CreateTime
+ if chatLog.SenderNickname == "" {
+ sendUser, err := m.User.GetUserInfo(ctx, chatLog.SendID)
+ if err != nil {
+ return nil, err
+ }
+ pbChatLog.SenderNickname = sendUser.Nickname
+ }
+ switch chatLog.SessionType {
+ case constant.SingleChatType:
+ recvUser, err := m.User.GetUserInfo(ctx, chatLog.RecvID)
+ if err != nil {
+ return nil, err
+ }
+ pbChatLog.SenderNickname = recvUser.Nickname
+
+ case constant.GroupChatType, constant.SuperGroupChatType:
+ group, err := m.Group.GetGroupInfo(ctx, chatLog.GroupID)
+ if err != nil {
+ return nil, err
+ }
+ pbChatLog.SenderFaceURL = group.FaceURL
+ pbChatLog.GroupMemberCount = group.MemberCount
+ pbChatLog.RecvID = group.GroupID
+ pbChatLog.GroupName = group.GroupName
+ pbChatLog.GroupOwner = group.OwnerUserID
+ pbChatLog.GroupType = group.GroupType
+ }
+ resp.ChatLogs = append(resp.ChatLogs, pbChatLog)
+ num++
+ }
+
+ resp.ChatLogsNum = int32(num)
+ return resp, nil
+}
diff --git a/pkg/apistruct/msg.go b/pkg/apistruct/msg.go
index 274c31a61..a07616ff2 100644
--- a/pkg/apistruct/msg.go
+++ b/pkg/apistruct/msg.go
@@ -1,8 +1,8 @@
package apistruct
type DelMsgReq struct {
- UserID string `json:"userID,omitempty" binding:"required"`
- SeqList []uint32 `json:"seqList,omitempty" binding:"required"`
+ UserID string `json:"userID,omitempty" binding:"required"`
+ SeqList []uint32 `json:"seqList,omitempty" binding:"required"`
OperationID string `json:"operationID,omitempty" binding:"required"`
}
@@ -10,19 +10,19 @@ type DelMsgResp struct {
}
type CleanUpMsgReq struct {
- UserID string `json:"userID" binding:"required"`
- OperationID string `json:"operationID" binding:"required"`
+ UserID string `json:"userID" binding:"required"`
+ OperationID string `json:"operationID" binding:"required"`
}
type CleanUpMsgResp struct {
}
type DelSuperGroupMsgReq struct {
- UserID string `json:"userID" binding:"required"`
- GroupID string `json:"groupID" binding:"required"`
+ UserID string `json:"userID" binding:"required"`
+ GroupID string `json:"groupID" binding:"required"`
SeqList []uint32 `json:"seqList,omitempty"`
IsAllDelete bool `json:"isAllDelete"`
- OperationID string `json:"operationID" binding:"required"`
+ OperationID string `json:"operationID" binding:"required"`
}
type DelSuperGroupMsgResp struct {
@@ -35,10 +35,10 @@ type MsgDeleteNotificationElem struct {
}
type SetMsgMinSeqReq struct {
- UserID string `json:"userID" binding:"required"`
+ UserID string `json:"userID" binding:"required"`
GroupID string `json:"groupID"`
- MinSeq uint32 `json:"minSeq" binding:"required"`
- OperationID string `json:"operationID" binding:"required"`
+ MinSeq uint32 `json:"minSeq" binding:"required"`
+ OperationID string `json:"operationID" binding:"required"`
}
type SetMsgMinSeqResp struct {
@@ -46,17 +46,17 @@ type SetMsgMinSeqResp struct {
type PictureBaseInfo struct {
UUID string `mapstructure:"uuid"`
- Type string `mapstructure:"type" `
- Size int64 `mapstructure:"size" `
- Width int32 `mapstructure:"width" `
+ Type string `mapstructure:"type"`
+ Size int64 `mapstructure:"size"`
+ Width int32 `mapstructure:"width"`
Height int32 `mapstructure:"height"`
- Url string `mapstructure:"url" `
+ Url string `mapstructure:"url"`
}
type PictureElem struct {
SourcePath string `mapstructure:"sourcePath"`
SourcePicture PictureBaseInfo `mapstructure:"sourcePicture"`
- BigPicture PictureBaseInfo `mapstructure:"bigPicture" `
+ BigPicture PictureBaseInfo `mapstructure:"bigPicture"`
SnapshotPicture PictureBaseInfo `mapstructure:"snapshotPicture"`
}
type SoundElem struct {
@@ -98,7 +98,7 @@ type LocationElem struct {
Latitude float64 `mapstructure:"latitude"`
}
type CustomElem struct {
- Data string `mapstructure:"data" validate:"required"`
+ Data string `mapstructure:"data" validate:"required"`
Description string `mapstructure:"description"`
Extension string `mapstructure:"extension"`
}
@@ -110,23 +110,23 @@ type RevokeElem struct {
RevokeMsgClientID string `mapstructure:"revokeMsgClientID" validate:"required"`
}
type OANotificationElem struct {
- NotificationName string `mapstructure:"notificationName" json:"notificationName" validate:"required"`
+ NotificationName string `mapstructure:"notificationName" json:"notificationName" validate:"required"`
NotificationFaceURL string `mapstructure:"notificationFaceURL" json:"notificationFaceURL"`
- NotificationType int32 `mapstructure:"notificationType" json:"notificationType" validate:"required"`
- Text string `mapstructure:"text" json:"text" validate:"required"`
- Url string `mapstructure:"url" json:"url"`
- MixType int32 `mapstructure:"mixType" json:"mixType"`
- PictureElem PictureElem `mapstructure:"pictureElem" json:"pictureElem"`
- SoundElem SoundElem `mapstructure:"soundElem" json:"soundElem"`
- VideoElem VideoElem `mapstructure:"videoElem" json:"videoElem"`
- FileElem FileElem `mapstructure:"fileElem" json:"fileElem"`
- Ex string `mapstructure:"ex" json:"ex"`
+ NotificationType int32 `mapstructure:"notificationType" json:"notificationType" validate:"required"`
+ Text string `mapstructure:"text" json:"text" validate:"required"`
+ Url string `mapstructure:"url" json:"url"`
+ MixType int32 `mapstructure:"mixType" json:"mixType"`
+ PictureElem PictureElem `mapstructure:"pictureElem" json:"pictureElem"`
+ SoundElem SoundElem `mapstructure:"soundElem" json:"soundElem"`
+ VideoElem VideoElem `mapstructure:"videoElem" json:"videoElem"`
+ FileElem FileElem `mapstructure:"fileElem" json:"fileElem"`
+ Ex string `mapstructure:"ex" json:"ex"`
}
type MessageRevoked struct {
- RevokerID string `mapstructure:"revokerID" json:"revokerID" validate:"required"`
- RevokerRole int32 `mapstructure:"revokerRole" json:"revokerRole" validate:"required"`
- ClientMsgID string `mapstructure:"clientMsgID" json:"clientMsgID" validate:"required"`
+ RevokerID string `mapstructure:"revokerID" json:"revokerID" validate:"required"`
+ RevokerRole int32 `mapstructure:"revokerRole" json:"revokerRole" validate:"required"`
+ ClientMsgID string `mapstructure:"clientMsgID" json:"clientMsgID" validate:"required"`
RevokerNickname string `mapstructure:"revokerNickname" json:"revokerNickname"`
- SessionType int32 `mapstructure:"sessionType" json:"sessionType" validate:"required"`
- Seq uint32 `mapstructure:"seq" json:"seq" validate:"required"`
+ SessionType int32 `mapstructure:"sessionType" json:"sessionType" validate:"required"`
+ Seq uint32 `mapstructure:"seq" json:"seq" validate:"required"`
}
diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go
index 8ff4195d2..c9ac80b44 100644
--- a/pkg/common/cmd/rpc.go
+++ b/pkg/common/cmd/rpc.go
@@ -3,10 +3,11 @@ package cmd
import (
"errors"
- "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
- "github.com/OpenIMSDK/Open-IM-Server/pkg/startrpc"
"github.com/spf13/cobra"
"google.golang.org/grpc"
+
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/startrpc"
)
type RpcCmd struct {
@@ -26,7 +27,10 @@ func (a *RpcCmd) Exec() error {
return a.Execute()
}
-func (a *RpcCmd) StartSvr(name string, rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
+func (a *RpcCmd) StartSvr(
+ name string,
+ rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error,
+) error {
if a.GetPortFlag() == 0 {
return errors.New("port is required")
}
diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go
index 55ef31acf..2e5432b48 100644
--- a/pkg/common/constant/constant.go
+++ b/pkg/common/constant/constant.go
@@ -18,19 +18,20 @@ const (
///ContentType
//UserRelated
- Text = 101
- Picture = 102
- Voice = 103
- Video = 104
- File = 105
- AtText = 106
- Merger = 107
- Card = 108
- Location = 109
- Custom = 110
- Revoke = 111
- Typing = 113
- Quote = 114
+ ContentTypeBegin = 100
+ Text = 101
+ Picture = 102
+ Voice = 103
+ Video = 104
+ File = 105
+ AtText = 106
+ Merger = 107
+ Card = 108
+ Location = 109
+ Custom = 110
+ Revoke = 111
+ Typing = 113
+ Quote = 114
AdvancedText = 117
@@ -290,8 +291,9 @@ const (
GroupResponseAgree = 1
GroupResponseRefuse = -1
- FriendResponseAgree = 1
- FriendResponseRefuse = -1
+ FriendResponseNotHandle = 0
+ FriendResponseAgree = 1
+ FriendResponseRefuse = -1
Male = 1
Female = 2
diff --git a/pkg/common/convert/black.go b/pkg/common/convert/black.go
index 684a40d0d..ba0e2a5da 100644
--- a/pkg/common/convert/black.go
+++ b/pkg/common/convert/black.go
@@ -27,6 +27,9 @@ func BlackDB2Pb(
blackDBs []*relation.BlackModel,
f func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
) (blackPbs []*sdk.BlackInfo, err error) {
+ if len(blackDBs) == 0 {
+ return nil, nil
+ }
var userIDs []string
for _, blackDB := range blackDBs {
userIDs = append(userIDs, blackDB.BlockUserID)
diff --git a/pkg/common/convert/friend.go b/pkg/common/convert/friend.go
index 018aee42f..0531ad195 100644
--- a/pkg/common/convert/friend.go
+++ b/pkg/common/convert/friend.go
@@ -54,6 +54,9 @@ func FriendsDB2Pb(
friendsDB []*relation.FriendModel,
getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
) (friendsPb []*sdkws.FriendInfo, err error) {
+ if len(friendsDB) == 0 {
+ return nil, nil
+ }
var userID []string
for _, friendDB := range friendsDB {
userID = append(userID, friendDB.FriendUserID)
@@ -80,6 +83,9 @@ func FriendRequestDB2Pb(
friendRequests []*relation.FriendRequestModel,
getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
) ([]*sdkws.FriendRequest, error) {
+ if len(friendRequests) == 0 {
+ return nil, nil
+ }
userIDMap := make(map[string]struct{})
for _, friendRequest := range friendRequests {
userIDMap[friendRequest.ToUserID] = struct{}{}
diff --git a/pkg/common/db/cache/init_redis.go b/pkg/common/db/cache/init_redis.go
index 72dfc8caf..be0431adf 100644
--- a/pkg/common/db/cache/init_redis.go
+++ b/pkg/common/db/cache/init_redis.go
@@ -27,6 +27,11 @@ import (
"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
)
+const (
+ maxRetry = 10 //number of retries
+)
+
+// NewRedis Initialize redis connection
func NewRedis() (redis.UniversalClient, error) {
if len(config.Config.Redis.Address) == 0 {
return nil, errors.New("redis address is empty")
@@ -35,25 +40,29 @@ func NewRedis() (redis.UniversalClient, error) {
var rdb redis.UniversalClient
if len(config.Config.Redis.Address) > 1 {
rdb = redis.NewClusterClient(&redis.ClusterOptions{
- Addrs: config.Config.Redis.Address,
- Username: config.Config.Redis.Username,
- Password: config.Config.Redis.Password, // no password set
- PoolSize: 50,
+ Addrs: config.Config.Redis.Address,
+ Username: config.Config.Redis.Username,
+ Password: config.Config.Redis.Password, // no password set
+ PoolSize: 50,
+ MaxRetries: maxRetry,
})
} else {
rdb = redis.NewClient(&redis.Options{
- Addr: config.Config.Redis.Address[0],
- Username: config.Config.Redis.Username,
- Password: config.Config.Redis.Password, // no password set
- DB: 0, // use default DB
- PoolSize: 100, // 连接池大小
+ Addr: config.Config.Redis.Address[0],
+ Username: config.Config.Redis.Username,
+ Password: config.Config.Redis.Password, // no password set
+ DB: 0, // use default DB
+ PoolSize: 100, // connection pool size
+ MaxRetries: maxRetry,
})
}
+
+ var err error = nil
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
- err := rdb.Ping(ctx).Err()
+ err = rdb.Ping(ctx).Err()
if err != nil {
return nil, fmt.Errorf("redis ping %w", err)
}
- return rdb, nil
+ return rdb, err
}
diff --git a/pkg/common/db/cache/init_redis_test.go b/pkg/common/db/cache/init_redis_test.go
new file mode 100644
index 000000000..7bf1a4a7d
--- /dev/null
+++ b/pkg/common/db/cache/init_redis_test.go
@@ -0,0 +1,36 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cache
+
+import (
+ "fmt"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+ "testing"
+)
+
+//TestNewRedis Test redis connection
+func TestNewRedis(t *testing.T) {
+ err := config.InitConfig("config_folder_path")
+ if err != nil {
+ fmt.Println("config load error")
+ return
+ }
+ redis, err := NewRedis()
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+ fmt.Println(redis)
+}
diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go
index 116345219..4d549efcf 100644
--- a/pkg/common/db/controller/friend.go
+++ b/pkg/common/db/controller/friend.go
@@ -221,6 +221,7 @@ func (f *friendDatabase) AgreeFriendRequest(
friendRequest *relation.FriendRequestModel,
) (err error) {
return f.tx.Transaction(func(tx any) error {
+ now := time.Now()
fr, err := f.friendRequest.NewTx(tx).Take(ctx, friendRequest.FromUserID, friendRequest.ToUserID)
if err != nil {
return err
@@ -230,11 +231,25 @@ func (f *friendDatabase) AgreeFriendRequest(
}
friendRequest.HandlerUserID = mcontext.GetOpUserID(ctx)
friendRequest.HandleResult = constant.FriendResponseAgree
- friendRequest.HandleTime = time.Now()
+ friendRequest.HandleTime = now
err = f.friendRequest.NewTx(tx).Update(ctx, friendRequest)
if err != nil {
return err
}
+
+ fr2, err := f.friendRequest.NewTx(tx).Take(ctx, friendRequest.ToUserID, friendRequest.FromUserID)
+ if err == nil && fr2.HandleResult == constant.FriendResponseNotHandle {
+ fr2.HandlerUserID = mcontext.GetOpUserID(ctx)
+ fr2.HandleResult = constant.FriendResponseAgree
+ fr2.HandleTime = now
+ err = f.friendRequest.NewTx(tx).Update(ctx, fr2)
+ if err != nil {
+ return err
+ }
+ } else if errs.Unwrap(err) != gorm.ErrRecordNotFound {
+ return err
+ }
+
exists, err := f.friend.NewTx(tx).FindUserState(ctx, friendRequest.FromUserID, friendRequest.ToUserID)
if err != nil {
return err
diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go
index 04300f704..f4a282af0 100644
--- a/pkg/common/db/relation/conversation_model.go
+++ b/pkg/common/db/relation/conversation_model.go
@@ -3,10 +3,11 @@ package relation
import (
"context"
+ "gorm.io/gorm"
+
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
- "gorm.io/gorm"
)
type ConversationGorm struct {
@@ -29,66 +30,172 @@ func (c *ConversationGorm) Delete(ctx context.Context, groupIDs []string) (err e
return utils.Wrap(c.db(ctx).Where("group_id in (?)", groupIDs).Delete(&relation.ConversationModel{}).Error, "")
}
-func (c *ConversationGorm) UpdateByMap(ctx context.Context, userIDList []string, conversationID string, args map[string]interface{}) (rows int64, err error) {
+func (c *ConversationGorm) UpdateByMap(
+ ctx context.Context,
+ userIDList []string,
+ conversationID string,
+ args map[string]interface{},
+) (rows int64, err error) {
result := c.db(ctx).Where("owner_user_id IN (?) and conversation_id=?", userIDList, conversationID).Updates(args)
return result.RowsAffected, utils.Wrap(result.Error, "")
}
func (c *ConversationGorm) Update(ctx context.Context, conversation *relation.ConversationModel) (err error) {
- return utils.Wrap(c.db(ctx).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).Updates(conversation).Error, "")
-}
-
-func (c *ConversationGorm) Find(ctx context.Context, ownerUserID string, conversationIDs []string) (conversations []*relation.ConversationModel, err error) {
- err = utils.Wrap(c.db(ctx).Where("owner_user_id=? and conversation_id IN (?)", ownerUserID, conversationIDs).Find(&conversations).Error, "")
+ return utils.Wrap(
+ c.db(ctx).
+ Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
+ Updates(conversation).
+ Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) Find(
+ ctx context.Context,
+ ownerUserID string,
+ conversationIDs []string,
+) (conversations []*relation.ConversationModel, err error) {
+ err = utils.Wrap(
+ c.db(ctx).
+ Where("owner_user_id=? and conversation_id IN (?)", ownerUserID, conversationIDs).
+ Find(&conversations).
+ Error,
+ "",
+ )
return conversations, err
}
-func (c *ConversationGorm) Take(ctx context.Context, userID, conversationID string) (conversation *relation.ConversationModel, err error) {
+func (c *ConversationGorm) Take(
+ ctx context.Context,
+ userID, conversationID string,
+) (conversation *relation.ConversationModel, err error) {
cc := &relation.ConversationModel{}
- return cc, utils.Wrap(c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error, "")
-}
-
-func (c *ConversationGorm) FindUserID(ctx context.Context, userIDs []string, conversationIDs []string) (existUserID []string, err error) {
- return existUserID, utils.Wrap(c.db(ctx).Where(" owner_user_id IN (?) and conversation_id in (?)", userIDs, conversationIDs).Pluck("owner_user_id", &existUserID).Error, "")
-}
-
-func (c *ConversationGorm) FindConversationID(ctx context.Context, userID string, conversationIDList []string) (existConversationID []string, err error) {
- return existConversationID, utils.Wrap(c.db(ctx).Where(" conversation_id IN (?) and owner_user_id=?", conversationIDList, userID).Pluck("conversation_id", &existConversationID).Error, "")
-}
-
-func (c *ConversationGorm) FindUserIDAllConversationID(ctx context.Context, userID string) (conversationIDList []string, err error) {
- return conversationIDList, utils.Wrap(c.db(ctx).Where("owner_user_id=?", userID).Pluck("conversation_id", &conversationIDList).Error, "")
-}
-
-func (c *ConversationGorm) FindUserIDAllConversations(ctx context.Context, userID string) (conversations []*relation.ConversationModel, err error) {
+ return cc, utils.Wrap(
+ c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) FindUserID(
+ ctx context.Context,
+ userIDs []string,
+ conversationIDs []string,
+) (existUserID []string, err error) {
+ return existUserID, utils.Wrap(
+ c.db(ctx).
+ Where(" owner_user_id IN (?) and conversation_id in (?)", userIDs, conversationIDs).
+ Pluck("owner_user_id", &existUserID).
+ Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) FindConversationID(
+ ctx context.Context,
+ userID string,
+ conversationIDList []string,
+) (existConversationID []string, err error) {
+ return existConversationID, utils.Wrap(
+ c.db(ctx).
+ Where(" conversation_id IN (?) and owner_user_id=?", conversationIDList, userID).
+ Pluck("conversation_id", &existConversationID).
+ Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) FindUserIDAllConversationID(
+ ctx context.Context,
+ userID string,
+) (conversationIDList []string, err error) {
+ return conversationIDList, utils.Wrap(
+ c.db(ctx).Where("owner_user_id=?", userID).Pluck("conversation_id", &conversationIDList).Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) FindUserIDAllConversations(
+ ctx context.Context,
+ userID string,
+) (conversations []*relation.ConversationModel, err error) {
return conversations, utils.Wrap(c.db(ctx).Where("owner_user_id=?", userID).Find(&conversations).Error, "")
}
-func (c *ConversationGorm) FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
- return userIDs, utils.Wrap(c.db(ctx).Where("group_id = ? and recv_msg_opt = ?", groupID, constant.ReceiveNotNotifyMessage).Pluck("user_id", &userIDs).Error, "")
-}
-
-func (c *ConversationGorm) FindSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
- return userIDs, utils.Wrap(c.db(ctx).Where("group_id = ? and recv_msg_opt = ? and conversation_type = ?", groupID, constant.ReceiveNotNotifyMessage, constant.SuperGroupChatType).Pluck("user_id", &userIDs).Error, "")
-}
-
-func (c *ConversationGorm) GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error) {
+func (c *ConversationGorm) FindRecvMsgNotNotifyUserIDs(
+ ctx context.Context,
+ groupID string,
+) (userIDs []string, err error) {
+ return userIDs, utils.Wrap(
+ c.db(ctx).
+ Where("group_id = ? and recv_msg_opt = ?", groupID, constant.ReceiveNotNotifyMessage).
+ Pluck("user_id", &userIDs).
+ Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) FindSuperGroupRecvMsgNotNotifyUserIDs(
+ ctx context.Context,
+ groupID string,
+) (userIDs []string, err error) {
+ return userIDs, utils.Wrap(
+ c.db(ctx).
+ Where("group_id = ? and recv_msg_opt = ? and conversation_type = ?", groupID, constant.ReceiveNotNotifyMessage, constant.SuperGroupChatType).
+ Pluck("user_id", &userIDs).
+ Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) GetUserRecvMsgOpt(
+ ctx context.Context,
+ ownerUserID, conversationID string,
+) (opt int, err error) {
var conversation relation.ConversationModel
- return int(conversation.RecvMsgOpt), utils.Wrap(c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, ownerUserID).Select("recv_msg_opt").Find(&conversation).Error, "")
+ return int(
+ conversation.RecvMsgOpt,
+ ), utils.Wrap(
+ c.db(ctx).
+ Where("conversation_id = ? And owner_user_id = ?", conversationID, ownerUserID).
+ Select("recv_msg_opt").
+ Find(&conversation).
+ Error,
+ "",
+ )
}
func (c *ConversationGorm) GetAllConversationIDs(ctx context.Context) (conversationIDs []string, err error) {
- return conversationIDs, utils.Wrap(c.db(ctx).Distinct("conversation_id").Pluck("conversation_id", &conversationIDs).Error, "")
+ return conversationIDs, utils.Wrap(
+ c.db(ctx).Distinct("conversation_id").Pluck("conversation_id", &conversationIDs).Error,
+ "",
+ )
}
-func (c *ConversationGorm) GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (hasReadSeqs map[string]int64, err error) {
+func (c *ConversationGorm) GetUserAllHasReadSeqs(
+ ctx context.Context,
+ ownerUserID string,
+) (hasReadSeqs map[string]int64, err error) {
return nil, nil
}
-func (c *ConversationGorm) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) (conversations []*relation.ConversationModel, err error) {
- return conversations, utils.Wrap(c.db(ctx).Where("conversation_id IN (?)", conversationIDs).Find(&conversations).Error, "")
-}
-
-func (c *ConversationGorm) GetConversationIDsNeedDestruct(ctx context.Context) (conversations []*relation.ConversationModel, err error) {
- return conversations, utils.Wrap(c.db(ctx).Where("is_msg_destruct = 1 && UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) && msg_destruct_time != 0").Find(&conversations).Error, "")
+func (c *ConversationGorm) GetConversationsByConversationID(
+ ctx context.Context,
+ conversationIDs []string,
+) (conversations []*relation.ConversationModel, err error) {
+ return conversations, utils.Wrap(
+ c.db(ctx).Where("conversation_id IN (?)", conversationIDs).Find(&conversations).Error,
+ "",
+ )
+}
+
+func (c *ConversationGorm) GetConversationIDsNeedDestruct(
+ ctx context.Context,
+) (conversations []*relation.ConversationModel, err error) {
+ return conversations, utils.Wrap(
+ c.db(ctx).
+ Where("is_msg_destruct = 1 && UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) && msg_destruct_time != 0").
+ Find(&conversations).
+ Error,
+ "",
+ )
}
diff --git a/pkg/common/db/relation/object_model.go b/pkg/common/db/relation/object_model.go
index cfbd011b8..bd2d22c3f 100644
--- a/pkg/common/db/relation/object_model.go
+++ b/pkg/common/db/relation/object_model.go
@@ -2,9 +2,11 @@ package relation
import (
"context"
+
+ "gorm.io/gorm"
+
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
- "gorm.io/gorm"
)
type ObjectInfoGorm struct {
diff --git a/pkg/common/db/table/unrelation/msg.go b/pkg/common/db/table/unrelation/msg.go
index e34bd374b..3a8725f36 100644
--- a/pkg/common/db/table/unrelation/msg.go
+++ b/pkg/common/db/table/unrelation/msg.go
@@ -16,6 +16,7 @@ package unrelation
import (
"context"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
"strconv"
"time"
@@ -108,8 +109,24 @@ type MsgDocModelInterface interface {
GetMsgDocModelByIndex(ctx context.Context, conversationID string, index, sort int64) (*MsgDocModel, error)
DeleteMsgsInOneDocByIndex(ctx context.Context, docID string, indexes []int) error
MarkSingleChatMsgsAsRead(ctx context.Context, userID string, docID string, indexes []int64) error
- RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*UserCount, dateCount map[string]int64, err error)
- RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*GroupCount, dateCount map[string]int64, err error)
+ SearchMessage(ctx context.Context, req *msg.SearchMessageReq) ([]*MsgInfoModel, error)
+ RangeUserSendCount(
+ ctx context.Context,
+ start time.Time,
+ end time.Time,
+ group bool,
+ ase bool,
+ pageNumber int32,
+ showNumber int32,
+ ) (msgCount int64, userCount int64, users []*UserCount, dateCount map[string]int64, err error)
+ RangeGroupSendCount(
+ ctx context.Context,
+ start time.Time,
+ end time.Time,
+ ase bool,
+ pageNumber int32,
+ showNumber int32,
+ ) (msgCount int64, userCount int64, groups []*GroupCount, dateCount map[string]int64, err error)
}
func (MsgDocModel) TableName() string {
diff --git a/pkg/common/db/unrelation/mongo.go b/pkg/common/db/unrelation/mongo.go
index fd13bb2aa..b2a99891e 100644
--- a/pkg/common/db/unrelation/mongo.go
+++ b/pkg/common/db/unrelation/mongo.go
@@ -31,19 +31,21 @@ import (
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
)
+const (
+ maxRetry = 10 //number of retries
+)
+
type Mongo struct {
db *mongo.Client
}
+// NewMongo Initialize MongoDB connection
func NewMongo() (*Mongo, error) {
specialerror.AddReplace(mongo.ErrNoDocuments, errs.ErrRecordNotFound)
- uri := "mongodb://sample.host:27017/?maxPoolSize=20&w=majority"
+ url := "mongodb://sample.host:27017/?maxPoolSize=20&w=majority"
if config.Config.Mongo.Uri != "" {
- // example:
- // mongodb://$user:$password@mongo1.mongo:27017,mongo2.mongo:27017,mongo3.mongo:27017/$DBDatabase/?replicaSet=rs0&readPreference=secondary&authSource=admin&maxPoolSize=$DBMaxPoolSize
- uri = config.Config.Mongo.Uri
+ url = config.Config.Mongo.Uri
} else {
- //mongodb://mongodb1.example.com:27317,mongodb2.example.com:27017/?replicaSet=mySet&authSource=authDB
mongodbHosts := ""
for i, v := range config.Config.Mongo.Address {
if i == len(config.Config.Mongo.Address)-1 {
@@ -53,23 +55,34 @@ func NewMongo() (*Mongo, error) {
}
}
if config.Config.Mongo.Password != "" && config.Config.Mongo.Username != "" {
- uri = fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d&authSource=admin",
+ url = fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d&authSource=admin",
config.Config.Mongo.Username, config.Config.Mongo.Password, mongodbHosts,
config.Config.Mongo.Database, config.Config.Mongo.MaxPoolSize)
} else {
- uri = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d&authSource=admin",
+ url = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d&authSource=admin",
mongodbHosts, config.Config.Mongo.Database,
config.Config.Mongo.MaxPoolSize)
}
}
- fmt.Println("mongo:", uri)
- ctx, cancel := context.WithTimeout(context.Background(), time.Second*60)
- defer cancel()
- mongoClient, err := mongo.Connect(ctx, options.Client().ApplyURI(uri))
- if err != nil {
- return nil, err
+ fmt.Println("mongo:", url)
+ var mongoClient *mongo.Client
+ var err error = nil
+ for i := 0; i <= maxRetry; i++ {
+ ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+ defer cancel()
+ mongoClient, err = mongo.Connect(ctx, options.Client().ApplyURI(url))
+ if err == nil {
+ return &Mongo{db: mongoClient}, nil
+ }
+ if cmdErr, ok := err.(mongo.CommandError); ok {
+ if cmdErr.Code == 13 || cmdErr.Code == 18 {
+ return nil, err
+ } else {
+ fmt.Printf("Failed to connect to MongoDB: %s\n", err)
+ }
+ }
}
- return &Mongo{db: mongoClient}, nil
+ return nil, err
}
func (m *Mongo) GetClient() *mongo.Client {
diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go
index 6c6d76216..5d26d45b2 100644
--- a/pkg/common/db/unrelation/msg.go
+++ b/pkg/common/db/unrelation/msg.go
@@ -19,6 +19,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
"time"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
@@ -555,7 +556,15 @@ func (m *MsgMongoDriver) MarkSingleChatMsgsAsRead(
// }
//
// ])
-func (m *MsgMongoDriver) RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*table.UserCount, dateCount map[string]int64, err error) {
+func (m *MsgMongoDriver) RangeUserSendCount(
+ ctx context.Context,
+ start time.Time,
+ end time.Time,
+ group bool,
+ ase bool,
+ pageNumber int32,
+ showNumber int32,
+) (msgCount int64, userCount int64, users []*table.UserCount, dateCount map[string]int64, err error) {
var sort int
if ase {
sort = 1
@@ -808,7 +817,14 @@ func (m *MsgMongoDriver) RangeUserSendCount(ctx context.Context, start time.Time
return result[0].MsgCount, result[0].UserCount, users, dateCount, nil
}
-func (m *MsgMongoDriver) RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*table.GroupCount, dateCount map[string]int64, err error) {
+func (m *MsgMongoDriver) RangeGroupSendCount(
+ ctx context.Context,
+ start time.Time,
+ end time.Time,
+ ase bool,
+ pageNumber int32,
+ showNumber int32,
+) (msgCount int64, userCount int64, groups []*table.GroupCount, dateCount map[string]int64, err error) {
var sort int
if ase {
sort = 1
@@ -1049,3 +1065,136 @@ func (m *MsgMongoDriver) RangeGroupSendCount(ctx context.Context, start time.Tim
}
return result[0].MsgCount, result[0].UserCount, groups, dateCount, nil
}
+
+func (m *MsgMongoDriver) SearchMessage(ctx context.Context, req *msg.SearchMessageReq) ([]*table.MsgInfoModel, error) {
+ msgs, err := m.searchMessage(ctx, req)
+ if err != nil {
+ return nil, err
+ }
+ for _, msg1 := range msgs {
+ if msg1.IsRead {
+ msg1.Msg.IsRead = true
+ }
+ }
+ return msgs, nil
+}
+
+func (m *MsgMongoDriver) searchMessage(ctx context.Context, req *msg.SearchMessageReq) ([]*table.MsgInfoModel, error) {
+ var pipe mongo.Pipeline
+ conditon := bson.A{}
+ if req.SendTime != "" {
+ conditon = append(conditon, bson.M{"$eq": bson.A{bson.M{"$dateToString": bson.M{"format": "%Y-%m-%d", "date": bson.M{"$toDate": "$$item.msg.send_time"}}}, req.SendTime}})
+ }
+ if req.MsgType != 0 {
+ conditon = append(conditon, bson.M{"$eq": bson.A{"$$item.msg.content_type", req.MsgType}})
+ }
+ if req.SessionType != 0 {
+ conditon = append(conditon, bson.M{"$eq": bson.A{"$$item.msg.session_type", req.SessionType}})
+ }
+ if req.RecvID != "" {
+ conditon = append(conditon, bson.M{"$regexFind": bson.M{"input": "$$item.msg.recv_id", "regex": req.RecvID}})
+ }
+ if req.SendID != "" {
+ conditon = append(conditon, bson.M{"$regexFind": bson.M{"input": "$$item.msg.send_id", "regex": req.SendID}})
+ }
+
+ or := bson.A{
+ bson.M{
+ "doc_id": bson.M{
+ "$regex": "^si_",
+ "$options": "i",
+ },
+ },
+ }
+ or = append(or,
+ bson.M{
+ "doc_id": bson.M{
+ "$regex": "^g_",
+ "$options": "i",
+ },
+ },
+ bson.M{
+ "doc_id": bson.M{
+ "$regex": "^sg_",
+ "$options": "i",
+ },
+ },
+ )
+
+ pipe = mongo.Pipeline{
+ {
+ {"$match", bson.D{
+ {
+ "$or", or,
+ },
+ }},
+ },
+ {
+ {"$project", bson.D{
+ {"msgs", bson.D{
+ {"$filter", bson.D{
+ {"input", "$msgs"},
+ {"as", "item"},
+ {"cond", bson.D{
+ {"$and", conditon},
+ },
+ }},
+ }},
+ },
+ {"doc_id", 1},
+ }},
+ },
+ }
+ cursor, err := m.MsgCollection.Aggregate(ctx, pipe)
+ if err != nil {
+ return nil, err
+ }
+
+ var msgsDocs []table.MsgDocModel
+ err = cursor.All(ctx, &msgsDocs)
+ if err != nil {
+ return nil, err
+ }
+ if len(msgsDocs) == 0 {
+ return nil, errs.Wrap(mongo.ErrNoDocuments)
+ }
+ msgs := make([]*table.MsgInfoModel, 0)
+ for index, _ := range msgsDocs {
+ for i := range msgsDocs[index].Msg {
+ msg := msgsDocs[index].Msg[i]
+ if msg == nil || msg.Msg == nil {
+ continue
+ }
+ if msg.Revoke != nil {
+ revokeContent := sdkws.MessageRevokedContent{
+ RevokerID: msg.Revoke.UserID,
+ RevokerRole: msg.Revoke.Role,
+ ClientMsgID: msg.Msg.ClientMsgID,
+ RevokerNickname: msg.Revoke.Nickname,
+ RevokeTime: msg.Revoke.Time,
+ SourceMessageSendTime: msg.Msg.SendTime,
+ SourceMessageSendID: msg.Msg.SendID,
+ SourceMessageSenderNickname: msg.Msg.SenderNickname,
+ SessionType: msg.Msg.SessionType,
+ Seq: msg.Msg.Seq,
+ Ex: msg.Msg.Ex,
+ }
+ data, err := json.Marshal(&revokeContent)
+ if err != nil {
+ return nil, err
+ }
+ elem := sdkws.NotificationElem{
+ Detail: string(data),
+ }
+ content, err := json.Marshal(&elem)
+ if err != nil {
+ return nil, err
+ }
+ msg.Msg.ContentType = constant.MsgRevokeNotification
+ msg.Msg.Content = string(content)
+ }
+ msgs = append(msgs, msg)
+ }
+ }
+ return msgs, nil
+}
diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go
index 72e3fae62..153deb30e 100644
--- a/pkg/common/http/http_client.go
+++ b/pkg/common/http/http_client.go
@@ -1,9 +1,18 @@
-/*
-** description("").
-** copyright('open-im,www.open-im.io').
-** author("fg,Gordon@tuoyun.net").
-** time(2021/5/27 10:31).
- */package http
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package http
import (
"bytes"
diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go
index 4c4ebc460..a749c76f8 100644
--- a/pkg/common/kafka/producer.go
+++ b/pkg/common/kafka/producer.go
@@ -17,12 +17,12 @@ package kafka
import (
"context"
"errors"
-
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
log "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+ "time"
"github.com/Shopify/sarama"
"google.golang.org/protobuf/proto"
@@ -30,6 +30,10 @@ import (
prome "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
)
+const (
+ maxRetry = 10 //number of retries
+)
+
var errEmptyMsg = errors.New("binary msg is empty")
type Producer struct {
@@ -39,6 +43,7 @@ type Producer struct {
producer sarama.SyncProducer
}
+// NewKafkaProducer Initialize kafka producer
func NewKafkaProducer(addr []string, topic string) *Producer {
p := Producer{}
p.config = sarama.NewConfig() //Instantiate a sarama Config
@@ -53,7 +58,24 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
}
p.addr = addr
p.topic = topic
- producer, err := sarama.NewSyncProducer(p.addr, p.config) //Initialize the client
+ var producer sarama.SyncProducer
+ var err error
+ for i := 0; i <= maxRetry; i++ {
+ producer, err = sarama.NewSyncProducer(p.addr, p.config) //Initialize the client
+ if err == nil {
+ p.producer = producer
+ return &p
+ }
+ //TODO If the password is wrong, exit directly
+ //if packetErr, ok := err.(*sarama.PacketEncodingError); ok {
+ //if _, ok := packetErr.Err.(sarama.AuthenticationError); ok {
+ // fmt.Println("Kafka password is wrong.")
+ //}
+ //} else {
+ // fmt.Printf("Failed to create Kafka producer: %v\n", err)
+ //}
+ time.Sleep(time.Duration(1) * time.Second)
+ }
if err != nil {
panic(err.Error())
}
diff --git a/pkg/common/mw/gin.go b/pkg/common/mw/gin.go
index 65f98dca3..a544c2a25 100644
--- a/pkg/common/mw/gin.go
+++ b/pkg/common/mw/gin.go
@@ -31,6 +31,7 @@ import (
"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
)
+// CorsHandler gin cross-domain configuration.
func CorsHandler() gin.HandlerFunc {
return func(c *gin.Context) {
c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
@@ -39,19 +40,19 @@ func CorsHandler() gin.HandlerFunc {
c.Header(
"Access-Control-Expose-Headers",
"Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar",
- ) // 跨域关键设置 让浏览器可以解析
+ ) // Cross-domain key settings allow browsers to resolve.
c.Header(
"Access-Control-Max-Age",
"172800",
- ) // 缓存请求信息 单位为秒
+ ) // Cache request information in seconds.
c.Header(
"Access-Control-Allow-Credentials",
"false",
- ) // 跨域请求是否需要带cookie信息 默认设置为true
+ ) // Whether cross-domain requests need to carry cookie information, the default setting is true.
c.Header(
"content-type",
"application/json",
- ) // 设置返回格式是json
+ ) // Set the return format to json.
//Release all option pre-requests
if c.Request.Method == http.MethodOptions {
c.JSON(http.StatusOK, "Options Request!")
diff --git a/pkg/proto/group/group.go b/pkg/proto/group/group.go
index 64e7f0f61..5b387cb3a 100644
--- a/pkg/proto/group/group.go
+++ b/pkg/proto/group/group.go
@@ -23,9 +23,6 @@ func (x *CreateGroupReq) Check() error {
if x.GroupInfo == nil {
return errs.ErrArgs.Wrap("groupInfo is empty")
}
- if x.GroupInfo.OwnerUserID == "" {
- return errs.ErrArgs.Wrap("GroupInfo.ownerUserID")
- }
if x.GroupInfo.GroupType > 2 || x.GroupInfo.GroupType < 0 {
return errs.ErrArgs.Wrap("GroupType is invalid")
}
diff --git a/pkg/proto/msg/msg.go b/pkg/proto/msg/msg.go
index aeb6deece..62b776856 100644
--- a/pkg/proto/msg/msg.go
+++ b/pkg/proto/msg/msg.go
@@ -133,9 +133,6 @@ func (x *MarkConversationAsReadReq) Check() error {
if x.ConversationID == "" {
return errs.ErrArgs.Wrap("conversationID is empty")
}
- if x.Seqs == nil {
- return errs.ErrArgs.Wrap("seqs is empty")
- }
if x.UserID == "" {
return errs.ErrArgs.Wrap("userID is empty")
}
@@ -165,9 +162,6 @@ func (x *ClearConversationsMsgReq) Check() error {
if x.UserID == "" {
return errs.ErrArgs.Wrap("userID is empty")
}
- if x.DeleteSyncOpt == nil {
- return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
- }
return nil
}
@@ -175,9 +169,6 @@ func (x *UserClearAllMsgReq) Check() error {
if x.UserID == "" {
return errs.ErrArgs.Wrap("userID is empty")
}
- if x.DeleteSyncOpt == nil {
- return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
- }
return nil
}
@@ -191,9 +182,6 @@ func (x *DeleteMsgsReq) Check() error {
if x.Seqs == nil {
return errs.ErrArgs.Wrap("seqs is empty")
}
- if x.DeleteSyncOpt == nil {
- return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
- }
return nil
}
diff --git a/pkg/proto/msg/msg.proto b/pkg/proto/msg/msg.proto
index d67195d44..ba9852740 100644
--- a/pkg/proto/msg/msg.proto
+++ b/pkg/proto/msg/msg.proto
@@ -232,12 +232,66 @@ message GetActiveGroupResp {
repeated ActiveGroup groups = 4;
}
+message SearchMessageReq{
+ string sendID=1;//发送者ID
+ string recvID=2;//接收者ID
+ int32 msgType=3;
+ string sendTime=4;
+ int32 sessionType=5;
+ sdkws.RequestPagination pagination = 6;
+}
+
+message SearchMessageResp{
+ repeated ChatLog chatLogs=1;
+ int32 chatLogsNum = 2;
+}
+
+message manageMsgReq{
+ string recvID=1;
+ string sendID=2;
+ string groupID=3;
+ int64 seq=4;
+ int32 sessionType=5;
+}
+
+message manageMsgResp{
+}
+
+message ChatLog {
+ string serverMsgID = 1;
+ string clientMsgID = 2;
+ string sendID = 3;
+ string recvID = 4;
+ string groupID = 5;
+ string recvNickname = 6;
+ int32 senderPlatformID = 7;
+ string senderNickname = 8;
+ string senderFaceURL = 9;
+ string groupName = 10;
+ int32 sessionType = 11;
+ int32 msgFrom = 12;
+ int32 contentType = 13;
+ string content = 14;
+ int32 status = 15;
+ int64 sendTime = 16;
+ int64 createTime = 17;
+ string ex = 18;
+ string groupFaceURL=19;
+ uint32 groupMemberCount=20;
+ int64 seq=21;
+ string groupOwner=22;
+ int32 groupType=23;
+}
+
+
service msg {
//获取最小最大seq（包括用户的，以及指定群组的）
rpc GetMaxSeq(sdkws.GetMaxSeqReq) returns(sdkws.GetMaxSeqResp);
rpc GetConversationMaxSeq(GetConversationMaxSeqReq) returns(GetConversationMaxSeqResp);
//拉取历史消息（包括用户的，以及指定群组的）
rpc PullMessageBySeqs(sdkws.PullMessageBySeqsReq) returns(sdkws.PullMessageBySeqsResp);
+ rpc SearchMessage(SearchMessageReq) returns(SearchMessageResp);
+ rpc ManageMsg(manageMsgReq) returns (manageMsgResp);
//发送消息
rpc SendMsg(SendMsgReq) returns(SendMsgResp);
diff --git a/pkg/proto/sdkws/sdkws.go b/pkg/proto/sdkws/sdkws.go
index 1c0888745..d0b0ae8aa 100644
--- a/pkg/proto/sdkws/sdkws.go
+++ b/pkg/proto/sdkws/sdkws.go
@@ -26,10 +26,10 @@ func (x *MsgData) Check() error {
if x.Content == nil {
return errs.ErrArgs.Wrap("content is empty")
}
- if x.ContentType < 101 || x.ContentType > 203 {
- return errs.ErrArgs.Wrap("content is empty")
+ if x.ContentType <= constant.ContentTypeBegin || x.ContentType >= constant.NotificationEnd {
+ return errs.ErrArgs.Wrap("content type is invalid")
}
- if x.SessionType < 1 || x.SessionType > 4 {
+ if x.SessionType < constant.SingleChatType || x.SessionType > constant.NotificationChatType {
return errs.ErrArgs.Wrap("sessionType is invalid")
}
if x.SessionType == constant.SingleChatType || x.SessionType == constant.NotificationChatType {
diff --git a/scripts/build_all_service.sh b/scripts/build_all_service.sh
index 5d8592eca..3fd56b420 100755
--- a/scripts/build_all_service.sh
+++ b/scripts/build_all_service.sh
@@ -26,8 +26,6 @@ echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
-cd $SCRIPTS_ROOT
-
echo -e ""
echo -e "${BACKGROUND_BLUE}===============> Building all using make build binary files ${COLOR_SUFFIX}"
@@ -37,8 +35,8 @@ echo -e "${BOLD_PREFIX}_________________________________________________________
bin_dir="$BIN_DIR"
-logs_dir="../logs"
-sdk_db_dir="../db/sdk/"
+logs_dir="$OPENIM_ROOT/logs"
+sdk_db_dir="$OPENIM_ROOT/db/sdk/"
# Automatically created when there is no bin, logs folder
if [ ! -d $bin_dir ]; then
mkdir -p $bin_dir
@@ -65,6 +63,11 @@ cd $OPENIM_ROOT
# Execute 'make build'
make build
+if [ $? -ne 0 ]; then
+ echo "make build Error, script exits"
+ exit 1
+fi
+
# Get the current operating system and architecture
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
ARCH=$(uname -m)
diff --git a/scripts/enterprise/check_all.sh b/scripts/enterprise/check_all.sh
index 973a6a962..271dfb452 100755
--- a/scripts/enterprise/check_all.sh
+++ b/scripts/enterprise/check_all.sh
@@ -43,7 +43,7 @@ for i in ${service_port_name[*]}; do
port=$(ss -tunlp| grep openim | awk '{print $5}' | grep -w ${j} | awk -F '[:]' '{print $NF}')
if [[ ${port} -ne ${j} ]]; then
echo -e ${BACKGROUND_GREEN}${i}${COLOR_SUFFIX}${RED_PREFIX}" service does not start normally,not initiated port is "${COLOR_SUFFIX}${BACKGROUND_GREEN}${j}${COLOR_SUFFIX}
- echo -e ${RED_PREFIX}"please check $OPENIM_ROOT/logs/openIM.log "${COLOR_SUFFIX}
+ echo -e ${RED_PREFIX}"please check $OPENIM_ROOT/logs/openIM.log"${COLOR_SUFFIX}
exit -1
else
echo -e ${j}${GREEN_PREFIX}" port has been listening,belongs service is "${i}${COLOR_SUFFIX}
diff --git a/scripts/githooks/pre-commit b/scripts/githooks/pre-commit
index 8fbee166c..cad60e163 100644
--- a/scripts/githooks/pre-commit
+++ b/scripts/githooks/pre-commit
@@ -26,7 +26,7 @@
LC_ALL=C
local_branch="$(git rev-parse --abbrev-ref HEAD)"
-valid_branch_regex="^(main|master|develop)$|(feature|feat|openim|release|hotfix|test|bug|ci|cicd|style|)\/[a-z0-9._-]+$|^HEAD$"
+valid_branch_regex="^(main|master|develop|release(-[a-zA-Z0-9._-]+)?)$|(feature|feat|openim|hotfix|test|bug|ci|cicd|style|)\/[a-z0-9._-]+$|^HEAD$"
YELLOW="\e[93m"
GREEN="\e[32m"
diff --git a/scripts/githooks/pre-push b/scripts/githooks/pre-push
index 2ed9736be..2985313b7 100644
--- a/scripts/githooks/pre-push
+++ b/scripts/githooks/pre-push
@@ -21,6 +21,9 @@ GREEN="\e[32m"
RED="\e[31m"
ENDCOLOR="\e[0m"
+local_branch="$(git rev-parse --abbrev-ref HEAD)"
+valid_branch_regex="^(main|master|develop|release(-[a-zA-Z0-9._-]+)?)$|(feature|feat|openim|hotfix|test|bug|ci|cicd|style|)\/[a-z0-9._-]+$|^HEAD$"
+
printMessage() {
printf "${YELLOW}OpenIM : $1${ENDCOLOR}\n"
}
@@ -96,6 +99,14 @@ print_color "Added Files: ${added_files}" "${BACKGROUND_GREEN}"
print_color "Modified Files: ${modified_files}" "${BACKGROUND_GREEN}"
print_color "Deleted Files: ${deleted_files}" "${BACKGROUND_GREEN}"
+if [[ ! $local_branch =~ $valid_branch_regex ]]
+then
+ printError "There is something wrong with your branch name. Branch names in this project must adhere to this contract: $valid_branch_regex.
+Your commit will be rejected. You should rename your branch to a valid name(feat/name OR bug/name) and try again."
+ printError "For more on this, read on: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694"
+ exit 1
+fi
+
#
#printMessage "Running the Flutter analyzer"
#flutter analyze
diff --git a/scripts/init_pwd.sh b/scripts/init_pwd.sh
index 25ee559a3..a3ce6048a 100755
--- a/scripts/init_pwd.sh
+++ b/scripts/init_pwd.sh
@@ -51,6 +51,8 @@ sed -i '/redis:/,/password:/s/password: .*/password: '${PASSWORD}'/' $config_fil
sed -i "/minio:/,/isDistributedMod:/ s/accessKeyID:.*/accessKeyID: $USER/" $config_file
sed -i "/minio:/,/isDistributedMod:/ s/secretAccessKey:.*/secretAccessKey: $PASSWORD/" $config_file
sed -i '/minio:/,/endpoint:/s|endpoint: .*|endpoint: '${MINIO_ENDPOINT}'|' $config_file
+sed -i '/object:/,/apiURL:/s|apiURL: .*|apiURL: '${API_URL}'|' $config_file
+
# Replace secret for token
sed -i "s/secret: .*/secret: $PASSWORD/" $config_file
diff --git a/scripts/msg_gateway_start.sh b/scripts/msg_gateway_start.sh
index f99ce9017..70267c85b 100755
--- a/scripts/msg_gateway_start.sh
+++ b/scripts/msg_gateway_start.sh
@@ -61,7 +61,7 @@ sleep 1
cd ${msg_gateway_binary_root}
for ((i = 0; i < ${#ws_ports[@]}; i++)); do
echo "==========================start msg_gateway server===========================">>$OPENIM_ROOT/logs/openIM.log
- nohup ./${openim_msggateway} --port ${rpc_ports[$i]} --ws_port ${ws_ports[$i]} --prometheus_port ${prome_ports[$i]} --config_folder_path ${configfile_path} >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
+ nohup ./${openim_msggateway} --port ${rpc_ports[$i]} --ws_port ${ws_ports[$i]} --prometheus_port ${prome_ports[$i]} --config_folder_path ${configfile_path} --configFolderPath ${log_path} >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
done
#Check launched service process
diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh
index e2034388b..cfc0efd30 100755
--- a/scripts/msg_transfer_start.sh
+++ b/scripts/msg_transfer_start.sh
@@ -24,6 +24,9 @@ source $SCRIPTS_ROOT/function.sh
cd $SCRIPTS_ROOT
+chmod +x build_all_service.sh
+./build_all_service.sh
+
echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
@@ -52,9 +55,9 @@ sleep 1
cd ${msg_transfer_binary_root}
for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
prome_port=${prome_ports[$i]}
- cmd="nohup ./${openim_msgtransfer} --config_folder_path ${configfile_path}"
+ cmd="nohup ./${openim_msgtransfer} --config_folder_path ${configfile_path} --configFolderPath ${log_path}"
if [ $prome_port != "" ]; then
- cmd="$cmd --prometheus_port $prome_port --config_folder_path ${configfile_path}"
+ cmd="$cmd --prometheus_port $prome_port --config_folder_path ${configfile_path} --configFolderPath ${log_path}"
fi
echo "==========================start msg_transfer server===========================">>$OPENIM_ROOT/logs/openIM.log
$cmd >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
diff --git a/scripts/path_info.sh b/scripts/path_info.sh
index bff87ed83..d3f6f4e1c 100755
--- a/scripts/path_info.sh
+++ b/scripts/path_info.sh
@@ -79,12 +79,10 @@ cmd_utils_name="openim-cmdutils"
cmd_utils_binary_root="$OPENIM_ROOT/$BIN_DIR"
cmd_utils_source_root="$OPENIM_ROOT/cmd/openim-cmdutils/"
-echo "debug========> config_path=$config_path"
# Global configuration file default dir
config_path="$OPENIM_ROOT/config/config.yaml"
configfile_path="$OPENIM_ROOT/config"
-
-echo "BUG: debug========> config_path=$config_path"
+log_path="$OPENIM_ROOT/log"
# servicefile dir path
service_source_root=(
diff --git a/scripts/start_all.sh b/scripts/start_all.sh
index 3554b7d14..244428539 100755
--- a/scripts/start_all.sh
+++ b/scripts/start_all.sh
@@ -35,6 +35,18 @@ bin_dir="$BIN_DIR"
logs_dir="$OPENIM_ROOT/logs"
sdk_db_dir="$OPENIM_ROOT/sdk/db/"
+if [ ! -d "$bin_dir" ]; then
+ mkdir -p "$bin_dir"
+fi
+
+if [ ! -d "$logs_dir" ]; then
+ mkdir -p "$logs_dir"
+fi
+
+if [ ! -d "$sdk_db_dir" ]; then
+ mkdir -p "$sdk_db_dir"
+fi
+
# Print title
echo -e "${BOLD_PREFIX}${BLUE_PREFIX}================> OpenIM Server Start${COLOR_SUFFIX}"
diff --git a/scripts/start_rpc_service.sh b/scripts/start_rpc_service.sh
index cafbb254e..09b7f69c5 100755
--- a/scripts/start_rpc_service.sh
+++ b/scripts/start_rpc_service.sh
@@ -95,24 +95,21 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do
portList2=$(cat $config_path | grep ${service_prometheus_port_name[$i]} | awk -F '[:]' '{print $NF}')
list_to_string $portList2
- echo -e "debug========>cmd=$cmd AAAAA"
prome_ports=($ports_array)
#Start related rpc services based on the number of ports
for ((j = 0; j < ${#service_ports[*]}; j++)); do
#Start the service in the background
if [ -z "${prome_ports[$j]}" ]; then
- cmd="./${service_filename[$i]} --port ${service_ports[$j]} --config_folder_path ${configfile_path}"
+ cmd="./${service_filename[$i]} --port ${service_ports[$j]} --config_folder_path ${configfile_path} --configFolderPath ${log_path}"
else
- cmd="./${service_filename[$i]} --port ${service_ports[$j]} --prometheus_port ${prome_ports[$j]} --config_folder_path ${configfile_path}"
+ cmd="./${service_filename[$i]} --port ${service_ports[$j]} --prometheus_port ${prome_ports[$j]} --config_folder_path ${configfile_path} --configFolderPath ${log_path}"
fi
if [ $i -eq 0 -o $i -eq 1 ]; then
cmd="./${service_filename[$i]} --port ${service_ports[$j]}"
fi
echo $cmd
- echo -e "debug========>cmd=$cmd"
echo "=====================start ${service_filename[$i]}======================">>$OPENIM_ROOT/logs/openIM.log
nohup $cmd >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
- echo -e "debug========>OpenIMROOT=$OPENIM_ROOT"
sleep 1
pid="netstat -ntlp|grep $j |awk '{printf \$7}'|cut -d/ -f1"
echo -e "${GREEN_PREFIX}${service_filename[$i]} start success,port number:${service_ports[$j]} pid:$(eval $pid)$COLOR_SUFFIX"
diff --git a/scripts/stop_all.sh b/scripts/stop_all.sh
index f413d2a66..8bd5aaf34 100755
--- a/scripts/stop_all.sh
+++ b/scripts/stop_all.sh
@@ -20,7 +20,6 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.sh
source $OPENIM_ROOT/scripts/path_info.sh
-source $OPENIM_ROOT/scripts/function.sh
bin_dir="$BIN_DIR"
logs_dir="$OPENIM_ROOT/logs"