withchao
c13fb56808
Merge remote-tracking branch 'upstream/mongo' into mongo
...
# Conflicts:
# go.sum
# internal/rpc/group/group.go
2023-12-01 16:22:19 +08:00
withchao
768e6bc758
merge main
2023-11-30 20:46:52 +08:00
withchao
775e62b539
Merge remote-tracking branch 'upstream/main' into mongo
...
# Conflicts:
# internal/msggateway/n_ws_server.go
# internal/rpc/group/group.go
# internal/rpc/third/third.go
# pkg/common/convert/user.go
# pkg/common/http/http_client.go
2023-11-30 20:16:38 +08:00
AndrewZuo01
0efc235f45
add webhooks ( #1465 )
...
* add callback before join group
* fix bug
* fix deployments/templates/alertmanager.yml
* fix bug
* update callback after join group
* merge callback after join group
* update callback setrgoup info
* test
* test
* test
* update three functions in friend category
* test friend and blacklist
* test
* test
* test
* Update openim.yaml
* merge callback after join group
* merge callback after join group
* merge callback after join group
* fix callbackbeforesetgroupinfo
* fix eventtime
* update api request required
* update api request required
* update api request required
* delete unused code
* delete unused code
* fix
* Update .env
* Update .env
* Update callback.go
* Update callback.go
* Update .env
* Update .env
* fix: merge
* update
* fix: merge
* fix: fix bugs
* update callback enable
* update callback enable
* update callback enable
* update callback enable
* update callback enable
* update callback enable
* Update openim.yaml
* Update environment.sh
* Update environment.md
* Update environment.md
* Update environment.sh
---------
Co-authored-by: Gordon <1432970085@qq.com>
2023-11-30 02:10:48 +00:00
Xinwei Xiong(cubxxw)
3b74ad56d4
feat: add format set
...
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
2023-11-29 16:27:26 +08:00
withchao
33e644e4fd
up35
2023-11-29 15:39:01 +08:00
fengyun.rui
35bac04f58
fix: grace shutdown for gw ( #1478 )
...
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-29 02:44:37 +00:00
healingtjx
4c7e0295bf
feat: OpenIMServer compatible qiniu kodo ( #1460 )
...
* build : add aws and kodo dependency
* feat: add qiniu kodo
* Doc : Add Qiniu Cloud Kodo Document and Config
2023-11-29 02:41:47 +00:00
xuexihuang
ceb669dfb8
Feature middleware ( #1476 )
...
* fix:fix error values&logs
* modify: add logs
* feature:add redis io retry logic
* feature:add redis error alert rule
* test:for test alert
* fix:fix prometheus rules
* del:del test code
---------
Co-authored-by: lin.huang <lin.huang@apulis.com>
2023-11-29 02:41:11 +00:00
Brabem
02142c55b2
feat: add callback func ( #1480 )
...
* feat:add callback func
* fix: fix the error
* fix: fix the error of repalce
* fix: fix the error of repalce
2023-11-28 07:26:46 +00:00
Gordon
e4046994cf
fix: update user's info will modify user create time when modify user's nickname or avatar. ( #1446 )
2023-11-26 12:22:41 +00:00
fengyun.rui
403cfb6055
perf: redis block with keys command ( #1423 )
...
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-26 12:16:02 +00:00
withchao
92f60d535f
all
2023-11-23 17:03:05 +08:00
withchao
0dba9db45b
index
2023-11-23 11:15:13 +08:00
withchao
7e4b4188b3
index
2023-11-23 10:50:58 +08:00
withchao
57399066c3
convert
2023-11-22 19:33:06 +08:00
fengyun.rui
a9153afc38
perf: control ws write buffer ( #1451 )
...
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-22 09:31:37 +00:00
withchao
0aba7d60a1
group
2023-11-22 15:21:33 +08:00
withchao
3be274be28
friend
2023-11-22 15:08:44 +08:00
withchao
9454dffc48
friend
2023-11-22 14:50:00 +08:00
withchao
73d404d384
friend
2023-11-22 14:43:02 +08:00
withchao
7834c038a9
friend
2023-11-22 14:38:56 +08:00
withchao
1dbd824a08
remove mysql
2023-11-22 14:12:53 +08:00
withchao
ce3b4eec08
remove mysql
2023-11-21 18:10:27 +08:00
Xinwei Xiong(cubxxw)
d98f63734b
refactor: add openim mysql to mongo refactor
...
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
2023-11-21 13:33:08 +08:00
Xinwei Xiong
c69420e1f4
Merge pull request #1449 from withchao/mongo
...
Mongo
2023-11-21 09:09:37 +08:00
Xinwei Xiong
6fddaf27e7
Merge branch 'mongo' into feat/mongo
2023-11-21 09:06:13 +08:00
Xinwei Xiong(cubxxw)
ca30a76952
refactor: add openim mysql to mongo refactor
...
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
2023-11-21 08:55:10 +08:00
withchao
47680aff3e
group
2023-11-20 16:29:38 +08:00
withchao
d054de9c6d
mongo
2023-11-17 17:42:33 +08:00
withchao
c0357a066b
group
2023-11-17 16:43:45 +08:00
withchao
3b6d91f0f1
s3
2023-11-17 16:30:30 +08:00
withchao
20158ec3ef
tx
2023-11-17 16:16:25 +08:00
withchao
7d3aeceea6
conversation
2023-11-16 17:16:37 +08:00
withchao
55fade28db
group
2023-11-16 15:49:25 +08:00
withchao
9e8791a4f4
group
2023-11-16 14:51:43 +08:00
withchao
371a592c0e
group
2023-11-16 12:01:53 +08:00
fengyun.rui
a19f0e534f
perf: redis batch delete msgs ( #1395 )
...
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-15 17:14:26 +00:00
fengyun.rui
eeb16d4116
perf: broadcast msg to all gateway with concurrency ( #1411 )
...
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-15 14:24:17 +00:00
withchao
88ca79a0ec
group
2023-11-15 17:44:14 +08:00
withchao
b338d666ea
group
2023-11-15 15:27:04 +08:00
withchao
d99e3d93e3
group
2023-11-15 11:23:51 +08:00
Xinwei Xiong
ae048417ee
"Add Prometheus Support with Documentation and Docker Compose Integration to OpenIM" ( #1403 )
...
* Code adaptation k8s: service discovery and registration adaptation, configuration adaptation
* Initial submission of the help charts script for openim API
* change the help charts script
* change the help charts script
* change helm chart codes
* change dockerfiles script
* change chart script:add configmap mounts
* change chart script:change repository
* change chart script:msggateway add one service
* change config.yaml
* roll back some config values
* change chart script:change Ingress rule with a rewrite annotation
* add mysql charts scrible
* change chart script:add mysql.config.yaml
* add nfs provisioner charts
* change chart script:add nfs.config.yaml
* add ingress-nginx charts
* change chart script:add ingress-nginx.config.yaml
* add redis &mongodb charts
* add kafka&minio charts
* change chart script:change redis.values.yaml
* change chart script:add redis.config.yaml
* change chart script:change redis.config.yaml
* change chart script:change mongodb.value.yaml
* change chart script:change mongodb.value.yaml
* change chart script:add mongodb.config.yaml
* change chart script:change minio.values.yaml
* change chart script:add minio.config.yaml
* change chart script:change kafka.values.yaml
* change chart script:add kafka.config.yaml
* change chart script:change services.config.yaml
* bug fix:Delete websocket's Port restrictions
* bug fix:change port value
* change chart script:Submit a stable version script
* fix bug:Implement option interface
* fix bug:change K8sDR.Register
* change config.yaml
* change chats script:minio service add ingress
* change chats script:minio service add ingress
* change chats script:kafka.replicaCount=3& change minio.api ingress
* delete change chats script
* change config.yaml
* change openim.yaml
* merge go.sum
* Add monitoring function and struct for Prometheus on gin and GRPC
* Add GRPC and gin server monitoring logic
* Add GRPC and gin server monitoring logic2
* Add GRPC and gin server monitoring logic3
* Add GRPC and gin server monitoring logic4
* Add GRPC and gin server monitoring logic5
* Add GRPC and gin server monitoring logic6
* Add GRPC and gin server monitoring logic7
* delete:old monitoring code
* add for test
* fix bug:change packname
* fix bug:delete getPromPort funciton
* fix bug:delete getPromPort funciton
* fix bug:change logs
* fix bug:change registerName logic in GetGrpcCusMetrics function
* add getPrometheus url api
* fix:config path logic
* fix:prometheus enable function
* fix:prometheus enable function
* fix:transfer Multi process monitoring logic
* del:del not using manifest
* fix:openim-msgtransfer.sh
* fix:openim-msgtransfer.sh
* cicd: robot automated Change
* delete not using files
* add prometheus docker-compose for monitor
* fix prometheus.yaml
* fix environment.sh
* fix init-config.sh
* fix init-config.sh
* fix env_template.yaml
* fix docker-compose.yml
* fix docker-compose.yml
* add openim_admin_front service
* change openim-admin-front
* del not using files
* add node-exporter-dashaboard.yaml
* fix: fix prom config file them
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* fix: fix prom config file them
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: Complete the source code module design of monitoring
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: Complete the source code module docs
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: Complete the source code module docs
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: add openim prometheus
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
---------
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
Co-authored-by: lin.huang <lin.huang@apulis.com>
Co-authored-by: xuexihuang <1339326187@qq.com>
Co-authored-by: xuexihuang <xuexihuang@users.noreply.github.com>
2023-11-15 02:38:21 +00:00
withchao
358f70895d
third
2023-11-14 20:48:14 +08:00
withchao
050ad7fa70
user
2023-11-14 15:52:57 +08:00
withchao
d4677f1a35
interface{} -> any
2023-11-14 14:57:08 +08:00
withchao
99c1c3d176
user
2023-11-14 14:54:20 +08:00
chao
05ab3fcd06
fix: the original quoted message is withdrawn and the quoted original message is displayed. ( #1391 )
...
* fix: GetUserReqApplicationList error when there is a disbanded group chat
* fix: error when querying some information about disbanded group
* fix: GetUserReqApplicationList dismissed group error
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* merge
* cicd: robot automated Change
* sdkws.MsgData
---------
Co-authored-by: withchao <withchao@users.noreply.github.com>
2023-11-14 02:47:56 +00:00
Xinwei Xiong
0d5fe4e6d6
Formatting adjustments, script removal, and helm template rendering ( #1389 )
...
* cicd: robot automated Change
* fix: add chat thmp
* fix: fix openim test file
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: add openim ctl system sctips remove
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: add openim cicd images
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: add openim cicd images
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: add openim config ete code
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* feat: fix openim pkg
---------
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
Co-authored-by: cubxxw <cubxxw@users.noreply.github.com>
2023-11-13 13:27:17 +00:00
chao
2ac54e09a6
fix: the original quoted message is withdrawn and the quoted original message is displayed. ( #1388 )
...
* fix: GetUserReqApplicationList error when there is a disbanded group chat
* fix: error when querying some information about disbanded group
* fix: GetUserReqApplicationList dismissed group error
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* fix: the original message referenced by the pull message processing is withdrawn
* merge
* cicd: robot automated Change
---------
Co-authored-by: withchao <withchao@users.noreply.github.com>
2023-11-13 12:01:31 +00:00
