mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-05-08 02:55:58 +08:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Xinwei Xiong(cubxxw)
|
1ed37f80c8 | ||
|
Xinwei Xiong(cubxxw)
|
32249a3ccc | ||
|
Xinwei Xiong(cubxxw)
|
723245c01f | ||
|
Xinwei Xiong(cubxxw)
|
0996193da7 | ||
|
Xinwei Xiong(cubxxw)
|
f69ea3dfd3 | ||
|
Xinwei Xiong(cubxxw)
|
8c93ffc4c6 | ||
|
Xinwei Xiong(cubxxw)
|
acec7c67f6 | ||
|
Xinwei Xiong(cubxxw)
|
0decd3a9b1 | ||
|
Xinwei Xiong(cubxxw)
|
b1fc0f870a | ||
|
Xinwei Xiong(cubxxw-openim)
|
75b15ca458 | ||
|
Xinwei Xiong(cubxxw-openim)
|
aa08863934 |
@@ -30,7 +30,7 @@ MINIO_ENDPOINT=http://172.28.0.1:10005
|
|||||||
|
|
||||||
# Base URL for the application programming interface (API).
|
# Base URL for the application programming interface (API).
|
||||||
# Default: API_URL=http://172.28.0.1:10002
|
# Default: API_URL=http://172.28.0.1:10002
|
||||||
API_URL=http://127.0.0.1:10002
|
API_URL=http://172.28.0.1:10002
|
||||||
|
|
||||||
# Directory path for storing data files or related information.
|
# Directory path for storing data files or related information.
|
||||||
# Default: DATA_DIR=./
|
# Default: DATA_DIR=./
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
name: Publish Docker image
|
name: Publish Docker image
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: '30 2 * * *'
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
name: Build OpenIM Web Docker image
|
name: Build OpenIM Web Docker image
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: '30 3 * * *'
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
@@ -28,114 +30,6 @@ env:
|
|||||||
GO_VERSION: "1.20"
|
GO_VERSION: "1.20"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-dockerhub:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
|
|
||||||
# docker.io/openim/openim-server:latest
|
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
|
||||||
id: meta
|
|
||||||
uses: docker/metadata-action@v4.6.0
|
|
||||||
with:
|
|
||||||
images: openim/openim-server
|
|
||||||
# generate Docker tags based on the following events/attributes
|
|
||||||
tags: |
|
|
||||||
type=schedule
|
|
||||||
type=ref,event=branch
|
|
||||||
type=ref,event=pr
|
|
||||||
type=semver,pattern={{version}}
|
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
|
||||||
type=semver,pattern={{major}}
|
|
||||||
type=sha
|
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Build and push Docker image
|
|
||||||
uses: docker/build-push-action@v4
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
# linux/ppc64le,linux/s390x
|
|
||||||
platforms: linux/amd64,linux/arm64
|
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
|
|
||||||
build-aliyun:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
# registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
|
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
|
||||||
id: meta2
|
|
||||||
uses: docker/metadata-action@v4.6.0
|
|
||||||
with:
|
|
||||||
images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web
|
|
||||||
|
|
||||||
- name: Log in to AliYun Docker Hub
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
registry: registry.cn-hangzhou.aliyuncs.com
|
|
||||||
username: ${{ secrets.ALIREGISTRY_USERNAME }}
|
|
||||||
password: ${{ secrets.ALIREGISTRY_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build and push Docker image
|
|
||||||
uses: docker/build-push-action@v4
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
# linux/ppc64le,linux/s390x
|
|
||||||
platforms: linux/amd64,linux/arm64
|
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
|
||||||
tags: ${{ steps.meta2.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta2.outputs.labels }}
|
|
||||||
|
|
||||||
build-ghcr:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
# ghcr.io/openimsdk/openim-server:latest
|
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
|
||||||
id: meta3
|
|
||||||
uses: docker/metadata-action@v4.6.0
|
|
||||||
with:
|
|
||||||
images: ghcr.io/openimsdk/openim-web
|
|
||||||
|
|
||||||
- name: Log in to GitHub Container Registry
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.repository_owner }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build and push Docker image
|
|
||||||
uses: docker/build-push-action@v4
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
# linux/ppc64le,linux/s390x
|
|
||||||
platforms: linux/amd64,linux/arm64
|
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
|
||||||
tags: ${{ steps.meta3.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta3.outputs.labels }}
|
|
||||||
|
|
||||||
build-openim-web-dockerhub:
|
build-openim-web-dockerhub:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
@@ -146,12 +40,12 @@ jobs:
|
|||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
# docker.io/openim/openim-server:latest
|
# docker.io/openim/openim-web:latest
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
- name: Extract metadata (tags, labels) for Docker
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v4.6.0
|
uses: docker/metadata-action@v4.6.0
|
||||||
with:
|
with:
|
||||||
images: openim/openim-server
|
images: openim/openim-web
|
||||||
# generate Docker tags based on the following events/attributes
|
# generate Docker tags based on the following events/attributes
|
||||||
tags: |
|
tags: |
|
||||||
type=schedule
|
type=schedule
|
||||||
@@ -187,12 +81,12 @@ jobs:
|
|||||||
uses: docker/setup-qemu-action@v2
|
uses: docker/setup-qemu-action@v2
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
# registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
|
# registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web:latest
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
- name: Extract metadata (tags, labels) for Docker
|
||||||
id: meta2
|
id: meta2
|
||||||
uses: docker/metadata-action@v4.6.0
|
uses: docker/metadata-action@v4.6.0
|
||||||
with:
|
with:
|
||||||
images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
|
images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web
|
||||||
|
|
||||||
- name: Log in to AliYun Docker Hub
|
- name: Log in to AliYun Docker Hub
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ jobs:
|
|||||||
version: 2.x
|
version: 2.x
|
||||||
- name: Docker Operations
|
- name: Docker Operations
|
||||||
run: |
|
run: |
|
||||||
curl -o docker-compose.yaml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml
|
curl -o docker-compose.yml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml
|
||||||
sudo docker compose up -d
|
sudo docker compose up -d
|
||||||
sudo sleep 60
|
sudo sleep 60
|
||||||
|
|
||||||
|
|||||||
@@ -8,24 +8,6 @@
|
|||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
|
||||||
<a name="v3.1.3-beta.1"></a>
|
|
||||||
## [v3.1.3-beta.1] - 2023-08-14
|
|
||||||
|
|
||||||
<a name="v3.1.3"></a>
|
|
||||||
## [v3.1.3] - 2023-08-14
|
|
||||||
|
|
||||||
<a name="v3.1.2-beta.3"></a>
|
|
||||||
## [v3.1.2-beta.3] - 2023-08-09
|
|
||||||
|
|
||||||
<a name="v3.1.2-beta.2"></a>
|
|
||||||
## [v3.1.2-beta.2] - 2023-08-09
|
|
||||||
|
|
||||||
<a name="v3.1.2-beta.1"></a>
|
|
||||||
## [v3.1.2-beta.1] - 2023-08-09
|
|
||||||
|
|
||||||
<a name="v3.1.2-beta.0"></a>
|
|
||||||
## [v3.1.2-beta.0] - 2023-08-08
|
|
||||||
|
|
||||||
<a name="v3.1.0"></a>
|
<a name="v3.1.0"></a>
|
||||||
## v3.1.0 - 2023-07-28
|
## v3.1.0 - 2023-07-28
|
||||||
### Reverts
|
### Reverts
|
||||||
@@ -35,10 +17,4 @@
|
|||||||
- Merge branch 'tuoyun'
|
- Merge branch 'tuoyun'
|
||||||
|
|
||||||
|
|
||||||
[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.1.3-beta.1...HEAD
|
[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.1.0...HEAD
|
||||||
[v3.1.3-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.1.3...v3.1.3-beta.1
|
|
||||||
[v3.1.3]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.3...v3.1.3
|
|
||||||
[v3.1.2-beta.3]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.2...v3.1.2-beta.3
|
|
||||||
[v3.1.2-beta.2]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.1...v3.1.2-beta.2
|
|
||||||
[v3.1.2-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.0...v3.1.2-beta.1
|
|
||||||
[v3.1.2-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.1.0...v3.1.2-beta.0
|
|
||||||
|
|||||||
@@ -8,39 +8,15 @@
|
|||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
|
||||||
<a name="v3.2.2"></a>
|
|
||||||
## [v3.2.2] - 2023-09-03
|
|
||||||
|
|
||||||
<a name="v3.2.3"></a>
|
|
||||||
## [v3.2.3] - 2023-09-03
|
|
||||||
|
|
||||||
<a name="v3.2.1"></a>
|
|
||||||
## [v3.2.1] - 2023-09-03
|
|
||||||
|
|
||||||
<a name="v3.2.2-beta.4"></a>
|
|
||||||
## [v3.2.2-beta.4] - 2023-08-28
|
|
||||||
|
|
||||||
<a name="v3.2.2-alpha.0"></a>
|
<a name="v3.2.2-alpha.0"></a>
|
||||||
## [v3.2.2-alpha.0] - 2023-08-25
|
## [v3.2.2-alpha.0] - 2023-08-25
|
||||||
|
|
||||||
<a name="v3.2.2-beta.3"></a>
|
|
||||||
## [v3.2.2-beta.3] - 2023-08-22
|
|
||||||
|
|
||||||
<a name="v3.2.2-beta.2"></a>
|
|
||||||
## [v3.2.2-beta.2] - 2023-08-21
|
|
||||||
|
|
||||||
<a name="v3.2.2-beta.1"></a>
|
|
||||||
## [v3.2.2-beta.1] - 2023-08-19
|
|
||||||
|
|
||||||
<a name="v3.2.0"></a>
|
<a name="v3.2.0"></a>
|
||||||
## [v3.2.0] - 2023-08-18
|
## [v3.2.0] - 2023-08-19
|
||||||
|
|
||||||
<a name="v3.2.0-rc.0"></a>
|
<a name="v3.2.0-rc.0"></a>
|
||||||
## [v3.2.0-rc.0] - 2023-08-17
|
## [v3.2.0-rc.0] - 2023-08-17
|
||||||
|
|
||||||
<a name="v3.2.2-beta.0"></a>
|
|
||||||
## [v3.2.2-beta.0] - 2023-08-17
|
|
||||||
|
|
||||||
<a name="v3.2.0-alpha.0"></a>
|
<a name="v3.2.0-alpha.0"></a>
|
||||||
## v3.2.0-alpha.0 - 2023-08-16
|
## v3.2.0-alpha.0 - 2023-08-16
|
||||||
### Reverts
|
### Reverts
|
||||||
@@ -50,15 +26,7 @@
|
|||||||
- Merge branch 'tuoyun'
|
- Merge branch 'tuoyun'
|
||||||
|
|
||||||
|
|
||||||
[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.2.2...HEAD
|
[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-alpha.0...HEAD
|
||||||
[v3.2.2]: https://github.com/openimsdk/open-im-server/compare/v3.2.3...v3.2.2
|
[v3.2.2-alpha.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0...v3.2.2-alpha.0
|
||||||
[v3.2.3]: https://github.com/openimsdk/open-im-server/compare/v3.2.1...v3.2.3
|
|
||||||
[v3.2.1]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.4...v3.2.1
|
|
||||||
[v3.2.2-beta.4]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-alpha.0...v3.2.2-beta.4
|
|
||||||
[v3.2.2-alpha.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.3...v3.2.2-alpha.0
|
|
||||||
[v3.2.2-beta.3]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.2...v3.2.2-beta.3
|
|
||||||
[v3.2.2-beta.2]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.1...v3.2.2-beta.2
|
|
||||||
[v3.2.2-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.2.0...v3.2.2-beta.1
|
|
||||||
[v3.2.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-rc.0...v3.2.0
|
[v3.2.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-rc.0...v3.2.0
|
||||||
[v3.2.0-rc.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.0...v3.2.0-rc.0
|
[v3.2.0-rc.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-alpha.0...v3.2.0-rc.0
|
||||||
[v3.2.2-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-alpha.0...v3.2.2-beta.0
|
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# Version logging for OpenIM
|
||||||
|
|
||||||
|
<!-- BEGIN MUNGE: GENERATED_TOC -->
|
||||||
|
|
||||||
|
<!-- END MUNGE: GENERATED_TOC -->
|
||||||
|
|
||||||
|
<a name="unreleased"></a>
|
||||||
|
## [Unreleased]
|
||||||
|
|
||||||
|
|
||||||
|
<a name="v3.3.1"></a>
|
||||||
|
## [v3.3.1] - 2023-09-13
|
||||||
|
|
||||||
|
<a name="v3.3.1-beta.0"></a>
|
||||||
|
## [v3.3.1-beta.0] - 2023-09-11
|
||||||
|
|
||||||
|
<a name="v3.3.0-rc.1"></a>
|
||||||
|
## [v3.3.0-rc.1] - 2023-09-11
|
||||||
|
|
||||||
|
<a name="v3.3.0-rc.12"></a>
|
||||||
|
## [v3.3.0-rc.12] - 2023-09-11
|
||||||
|
|
||||||
|
<a name="v3.3.0"></a>
|
||||||
|
## [v3.3.0] - 2023-09-09
|
||||||
|
|
||||||
|
<a name="v3.3.0-rc.0"></a>
|
||||||
|
## v3.3.0-rc.0 - 2023-09-07
|
||||||
|
### Reverts
|
||||||
|
- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206))
|
||||||
|
|
||||||
|
### Pull Requests
|
||||||
|
- Merge branch 'tuoyun'
|
||||||
|
|
||||||
|
|
||||||
|
[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.3.1...HEAD
|
||||||
|
[v3.3.1]: https://github.com/openimsdk/open-im-server/compare/v3.3.1-beta.0...v3.3.1
|
||||||
|
[v3.3.1-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.3.0-rc.1...v3.3.1-beta.0
|
||||||
|
[v3.3.0-rc.1]: https://github.com/openimsdk/open-im-server/compare/v3.3.0-rc.12...v3.3.0-rc.1
|
||||||
|
[v3.3.0-rc.12]: https://github.com/openimsdk/open-im-server/compare/v3.3.0...v3.3.0-rc.12
|
||||||
|
[v3.3.0]: https://github.com/openimsdk/open-im-server/compare/v3.3.0-rc.0...v3.3.0
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="./README.md"><b> English </b></a> •
|
<a href="./README.md"><b> English </b></a> •
|
||||||
<a href="./README-zh_CN.md"><b> 简体中文 </b></a> •
|
<a href="./README-zh_CN.md"><b> 简体中文 </b></a> •
|
||||||
<a href="https://www.openim.online/en"><b> Docs </b></a>
|
<a href="https://www.openim.online/en"><b> Docs </b></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
@@ -166,7 +166,7 @@ Deploy basic components at the click of a command:
|
|||||||
```bash
|
```bash
|
||||||
# install openim dependency
|
# install openim dependency
|
||||||
$ git clone https://github.com/openimsdk/open-im-server openim/openim-server && export openim=$(pwd)/openim/openim-server && cd $openim/openim-server && git checkout $OPENIM_VERSION
|
$ git clone https://github.com/openimsdk/open-im-server openim/openim-server && export openim=$(pwd)/openim/openim-server && cd $openim/openim-server && git checkout $OPENIM_VERSION
|
||||||
$ make init && docker compose -f basic-openim-server-dependency.yml up -d && make start && make check
|
$ make init && docker compose up -d && make start && make check
|
||||||
```
|
```
|
||||||
|
|
||||||
> `make help` to help you see the instructions supported by OpenIM.
|
> `make help` to help you see the instructions supported by OpenIM.
|
||||||
|
|||||||
+2
-5
@@ -132,21 +132,19 @@ api:
|
|||||||
# minio.signEndpoint is minio public network address
|
# minio.signEndpoint is minio public network address
|
||||||
object:
|
object:
|
||||||
enable: "minio"
|
enable: "minio"
|
||||||
apiURL: "http://127.0.0.1:10002"
|
apiURL: "http://172.28.0.1:10002"
|
||||||
minio:
|
minio:
|
||||||
bucket: "openim"
|
bucket: "openim"
|
||||||
endpoint: "http://172.28.0.1:10005"
|
endpoint: "http://172.28.0.1:10005"
|
||||||
accessKeyID: "root"
|
accessKeyID: "root"
|
||||||
secretAccessKey: "openIM123"
|
secretAccessKey: "openIM123"
|
||||||
sessionToken: ''
|
sessionToken: ''
|
||||||
signEndpoint: "http://127.0.0.1:10005"
|
signEndpoint: "http://172.28.0.1:10002"
|
||||||
publicRead: false
|
|
||||||
cos:
|
cos:
|
||||||
bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com
|
bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com
|
||||||
secretID: ''
|
secretID: ''
|
||||||
secretKey: ''
|
secretKey: ''
|
||||||
sessionToken: ''
|
sessionToken: ''
|
||||||
publicRead: false
|
|
||||||
oss:
|
oss:
|
||||||
endpoint: "https://oss-cn-chengdu.aliyuncs.com"
|
endpoint: "https://oss-cn-chengdu.aliyuncs.com"
|
||||||
bucket: "demo-9999999"
|
bucket: "demo-9999999"
|
||||||
@@ -154,7 +152,6 @@ object:
|
|||||||
accessKeyID: ''
|
accessKeyID: ''
|
||||||
accessKeySecret: ''
|
accessKeySecret: ''
|
||||||
sessionToken: ''
|
sessionToken: ''
|
||||||
publicRead: false
|
|
||||||
|
|
||||||
|
|
||||||
###################### RPC Port Configuration ######################
|
###################### RPC Port Configuration ######################
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ $ SEALOS_VERSION=`curl -s https://api.github.com/repos/labring/sealos/releases/l
|
|||||||
```bash
|
```bash
|
||||||
$ export CLUSTER_USERNAME=ubuntu
|
$ export CLUSTER_USERNAME=ubuntu
|
||||||
$ export CLUSTER_PASSWORD=123456
|
$ export CLUSTER_PASSWORD=123456
|
||||||
$ sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:v3.24.1 \
|
$ sudo sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:v3.24.1 \
|
||||||
--masters 10.0.0.9 \
|
--masters 10.0.0.9 \
|
||||||
--nodes 10.0.0.4,10.0.0.10 \
|
--nodes 10.0.0.4,10.0.0.10 \
|
||||||
-u "$CLUSTER_USERNAME" \
|
-u "$CLUSTER_USERNAME" \
|
||||||
|
|||||||
@@ -0,0 +1,201 @@
|
|||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
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.
|
||||||
@@ -35,4 +35,40 @@ version: 0.1.0
|
|||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: "1.16.0"
|
appVersion: "default"
|
||||||
|
|
||||||
|
icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
|
||||||
|
|
||||||
|
maintainers:
|
||||||
|
- name: "OpenIM"
|
||||||
|
url: "https://github.com/openimsdk"
|
||||||
|
|
||||||
|
keywords:
|
||||||
|
- openim
|
||||||
|
- im
|
||||||
|
- chat
|
||||||
|
|
||||||
|
sources:
|
||||||
|
- "https://github.com/openimsdk/open-im-server"
|
||||||
|
- "https://github.com/openimsdk/openim-sdk-core"
|
||||||
|
- "https://github.com/openimsdk/openim-docker"
|
||||||
|
|
||||||
|
dependencies:
|
||||||
|
- name: mysql
|
||||||
|
version: 8.0.25
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
- name: redis
|
||||||
|
version: 14.6.1
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
- name: mongodb
|
||||||
|
version: 10.1.0
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
- name: kafka
|
||||||
|
version: 14.1.0
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
- name: minio
|
||||||
|
version: 8.1.2
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
- name: zookeeper
|
||||||
|
version: 5.17.0
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
@@ -0,0 +1,201 @@
|
|||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
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.
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# OpenIM Server Chat
|
||||||
|
|
||||||
|
## 目录结构
|
||||||
|
|
||||||
|
```bash
|
||||||
|
openim-server/
|
||||||
|
Chart.yaml # 包含了chart信息的YAML文件
|
||||||
|
LICENSE # 包含OpenIM Chart许可证的纯文本文件
|
||||||
|
README.md # OpenIM 可读的README文件
|
||||||
|
values.yaml # chart 默认的配置值
|
||||||
|
charts/ # 包含chart依赖的其他chart
|
||||||
|
crds/ # 自定义资源的定义
|
||||||
|
templates/ # 模板目录， 当和values 结合时，可生成有效的Kubernetes manifest文件
|
||||||
|
templates/NOTES.txt # 包含简要使用说明的纯文本文件
|
||||||
|
```
|
||||||
@@ -36,6 +36,13 @@ API_URL=${API_URL}
|
|||||||
# Default: DATA_DIR=./
|
# Default: DATA_DIR=./
|
||||||
DATA_DIR=${DATA_DIR}
|
DATA_DIR=${DATA_DIR}
|
||||||
|
|
||||||
|
# Choose the appropriate image address, the default is GITHUB image,
|
||||||
|
# you can choose docker hub, for Chinese users can choose Ali Cloud
|
||||||
|
# export IMAGE_REGISTRY="ghcr.io/openimsdk"
|
||||||
|
# export IMAGE_REGISTRY="openim"
|
||||||
|
# export IMAGE_REGISTRY="registry.cn-hangzhou.aliyuncs.com/openimsdk"
|
||||||
|
IMAGE_REGISTRY=${IMAGE_REGISTRY}
|
||||||
|
|
||||||
# ======================================
|
# ======================================
|
||||||
# ========= Network Configuration ======
|
# ========= Network Configuration ======
|
||||||
# ======================================
|
# ======================================
|
||||||
@@ -227,7 +234,6 @@ OPENIM_WEB_PORT=${OPENIM_WEB_PORT}
|
|||||||
# Default: OPENIM_WEB_ADDRESS=172.28.0.1
|
# Default: OPENIM_WEB_ADDRESS=172.28.0.1
|
||||||
OPENIM_WEB_ADDRESS=${OPENIM_WEB_NETWORK_ADDRESS}
|
OPENIM_WEB_ADDRESS=${OPENIM_WEB_NETWORK_ADDRESS}
|
||||||
|
|
||||||
|
|
||||||
# ======================================
|
# ======================================
|
||||||
# ========= OpenIM Server ==============
|
# ========= OpenIM Server ==============
|
||||||
# ======================================
|
# ======================================
|
||||||
|
|||||||
@@ -140,13 +140,11 @@ object:
|
|||||||
secretAccessKey: "${MINIO_SECRET_KEY}"
|
secretAccessKey: "${MINIO_SECRET_KEY}"
|
||||||
sessionToken: ${MINIO_SESSION_TOKEN}
|
sessionToken: ${MINIO_SESSION_TOKEN}
|
||||||
signEndpoint: "${MINIO_SIGN_ENDPOINT}"
|
signEndpoint: "${MINIO_SIGN_ENDPOINT}"
|
||||||
publicRead: ${MINIO_PUBLIC_READ}
|
|
||||||
cos:
|
cos:
|
||||||
bucketURL: ${COS_BUCKET_URL}
|
bucketURL: ${COS_BUCKET_URL}
|
||||||
secretID: ${COS_SECRET_ID}
|
secretID: ${COS_SECRET_ID}
|
||||||
secretKey: ${COS_SECRET_KEY}
|
secretKey: ${COS_SECRET_KEY}
|
||||||
sessionToken: ${COS_SESSION_TOKEN}
|
sessionToken: ${COS_SESSION_TOKEN}
|
||||||
publicRead: ${COS_PUBLIC_READ}
|
|
||||||
oss:
|
oss:
|
||||||
endpoint: "${OSS_ENDPOINT}"
|
endpoint: "${OSS_ENDPOINT}"
|
||||||
bucket: "${OSS_BUCKET}"
|
bucket: "${OSS_BUCKET}"
|
||||||
@@ -154,7 +152,7 @@ object:
|
|||||||
accessKeyID: ${OSS_ACCESS_KEY_ID}
|
accessKeyID: ${OSS_ACCESS_KEY_ID}
|
||||||
accessKeySecret: ${OSS_ACCESS_KEY_SECRET}
|
accessKeySecret: ${OSS_ACCESS_KEY_SECRET}
|
||||||
sessionToken: ${OSS_SESSION_TOKEN}
|
sessionToken: ${OSS_SESSION_TOKEN}
|
||||||
publicRead: ${OSS_PUBLIC_READ}
|
|
||||||
|
|
||||||
###################### RPC Port Configuration ######################
|
###################### RPC Port Configuration ######################
|
||||||
# RPC service ports
|
# RPC service ports
|
||||||
@@ -228,18 +226,18 @@ push:
|
|||||||
enable: ${PUSH_ENABLE}
|
enable: ${PUSH_ENABLE}
|
||||||
geTui:
|
geTui:
|
||||||
pushUrl: "${GETUI_PUSH_URL}"
|
pushUrl: "${GETUI_PUSH_URL}"
|
||||||
masterSecret: ""
|
masterSecret: ${GETUI_MASTER_SECRET}
|
||||||
appKey: ""
|
appKey: ${GETUI_APP_KEY}
|
||||||
intent: ""
|
intent: ${GETUI_INTENT}
|
||||||
channelID: ""
|
channelID: ${GETUI_CHANNEL_ID}
|
||||||
channelName: ""
|
channelName: ${GETUI_CHANNEL_NAME}
|
||||||
fcm:
|
fcm:
|
||||||
serviceAccount: "${FCM_SERVICE_ACCOUNT}"
|
serviceAccount: "${FCM_SERVICE_ACCOUNT}"
|
||||||
jpns:
|
jpns:
|
||||||
appKey:
|
appKey: ${JPNS_APP_KEY}
|
||||||
masterSecret:
|
masterSecret: ${JPNS_MASTER_SECRET}
|
||||||
pushUrl:
|
pushUrl: ${JPNS_PUSH_URL}
|
||||||
pushIntent:
|
pushIntent: ${JPNS_PUSH_INTENT}
|
||||||
|
|
||||||
# App manager configuration
|
# App manager configuration
|
||||||
#
|
#
|
||||||
|
|||||||
+5
-3
@@ -127,9 +127,10 @@ services:
|
|||||||
ipv4_address: ${MINIO_NETWORK_ADDRESS}
|
ipv4_address: ${MINIO_NETWORK_ADDRESS}
|
||||||
|
|
||||||
openim-web:
|
openim-web:
|
||||||
image: ghcr.io/openimsdk/openim-web:latest
|
# image: ghcr.io/openimsdk/openim-web:latest
|
||||||
# image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web:latest
|
# image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web:latest
|
||||||
# image: openim/openim-web:latest
|
# image: openim/openim-web:latest
|
||||||
|
image: ${IMAGE_REGISTRY}/openim-web:latest
|
||||||
container_name: openim-web
|
container_name: openim-web
|
||||||
environment:
|
environment:
|
||||||
- OPENIM_WEB_DIST_PATH=${OPENIM_WEB_DIST_PATH}
|
- OPENIM_WEB_DIST_PATH=${OPENIM_WEB_DIST_PATH}
|
||||||
@@ -142,9 +143,10 @@ services:
|
|||||||
ipv4_address: ${OPENIM_WEB_NETWORK_ADDRESS}
|
ipv4_address: ${OPENIM_WEB_NETWORK_ADDRESS}
|
||||||
|
|
||||||
# openim-server:
|
# openim-server:
|
||||||
# image: ghcr.io/openimsdk/openim-server:main
|
# # image: ghcr.io/openimsdk/openim-server:main
|
||||||
# # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main
|
# # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main
|
||||||
# # image: openim/openim-server:main
|
# # image: openim/openim-server:main
|
||||||
|
# image: ${IMAGE_REGISTRY}/openim-server:main
|
||||||
# # build: .
|
# # build: .
|
||||||
# container_name: openim-server
|
# container_name: openim-server
|
||||||
# ports:
|
# ports:
|
||||||
@@ -203,4 +205,4 @@ services:
|
|||||||
# - prometheus
|
# - prometheus
|
||||||
# networks:
|
# networks:
|
||||||
# openim-server:
|
# openim-server:
|
||||||
# ipv4_address: ${GRAFANA_NETWORK_ADDRESS}
|
# ipv4_address: ${GRAFANA_NETWORK_ADDRESS}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ require github.com/google/uuid v1.3.1
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/IBM/sarama v1.41.1
|
github.com/IBM/sarama v1.41.1
|
||||||
github.com/OpenIMSDK/protocol v0.0.23
|
github.com/OpenIMSDK/protocol v0.0.21
|
||||||
github.com/OpenIMSDK/tools v0.0.14
|
github.com/OpenIMSDK/tools v0.0.14
|
||||||
github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible
|
github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible
|
||||||
github.com/go-redis/redis v6.15.9+incompatible
|
github.com/go-redis/redis v6.15.9+incompatible
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIw
|
|||||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||||
github.com/IBM/sarama v1.41.1 h1:B4/TdHce/8Ipza+qrLIeNJ9D1AOxZVp/3uDv6H/dp2M=
|
github.com/IBM/sarama v1.41.1 h1:B4/TdHce/8Ipza+qrLIeNJ9D1AOxZVp/3uDv6H/dp2M=
|
||||||
github.com/IBM/sarama v1.41.1/go.mod h1:JFCPURVskaipJdKRFkiE/OZqQHw7jqliaJmRwXCmSSw=
|
github.com/IBM/sarama v1.41.1/go.mod h1:JFCPURVskaipJdKRFkiE/OZqQHw7jqliaJmRwXCmSSw=
|
||||||
github.com/OpenIMSDK/protocol v0.0.23 h1:L545aRQez6Ro+AaJB1Z6Mz7ojnDtp41WqASxYveCkcE=
|
github.com/OpenIMSDK/protocol v0.0.21 h1:5H6H+hJ9d/VgRqttvxD/zfK9Asd+4M8Eknk5swSbUVY=
|
||||||
github.com/OpenIMSDK/protocol v0.0.23/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
|
github.com/OpenIMSDK/protocol v0.0.21/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
|
||||||
github.com/OpenIMSDK/tools v0.0.14 h1:WLof/+WxyPyRST+QkoTKubYCiV73uCLiL8pgnpH/yKQ=
|
github.com/OpenIMSDK/tools v0.0.14 h1:WLof/+WxyPyRST+QkoTKubYCiV73uCLiL8pgnpH/yKQ=
|
||||||
github.com/OpenIMSDK/tools v0.0.14/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
|
github.com/OpenIMSDK/tools v0.0.14/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
|
||||||
github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
|
github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
|
||||||
|
|||||||
+2
-3
@@ -58,7 +58,7 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg)
|
|||||||
options := make(map[string]bool, 5)
|
options := make(map[string]bool, 5)
|
||||||
switch params.ContentType {
|
switch params.ContentType {
|
||||||
case constant.Text:
|
case constant.Text:
|
||||||
fallthrough
|
newContent = params.Content["text"].(string)
|
||||||
case constant.Picture:
|
case constant.Picture:
|
||||||
fallthrough
|
fallthrough
|
||||||
case constant.Custom:
|
case constant.Custom:
|
||||||
@@ -100,7 +100,6 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg)
|
|||||||
ContentType: params.ContentType,
|
ContentType: params.ContentType,
|
||||||
Content: []byte(newContent),
|
Content: []byte(newContent),
|
||||||
CreateTime: utils.GetCurrentTimestampByMill(),
|
CreateTime: utils.GetCurrentTimestampByMill(),
|
||||||
SendTime: params.SendTime,
|
|
||||||
Options: options,
|
Options: options,
|
||||||
OfflinePushInfo: params.OfflinePushInfo,
|
OfflinePushInfo: params.OfflinePushInfo,
|
||||||
},
|
},
|
||||||
@@ -208,6 +207,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
|
|||||||
apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
log.ZInfo(c, "SendMessage", "req", req)
|
||||||
if !authverify.IsAppManagerUid(c) {
|
if !authverify.IsAppManagerUid(c) {
|
||||||
apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
|
apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
|
||||||
return
|
return
|
||||||
@@ -224,7 +224,6 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
|
|||||||
respPb, err := m.Client.SendMsg(c, sendMsgReq)
|
respPb, err := m.Client.SendMsg(c, sendMsgReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
status = constant.MsgSendFailed
|
status = constant.MsgSendFailed
|
||||||
log.ZError(c, "send message err", err)
|
|
||||||
apiresp.GinError(c, err)
|
apiresp.GinError(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,11 +156,6 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
|
|||||||
thirdGroup.POST("/fcm_update_token", t.FcmUpdateToken)
|
thirdGroup.POST("/fcm_update_token", t.FcmUpdateToken)
|
||||||
thirdGroup.POST("/set_app_badge", t.SetAppBadge)
|
thirdGroup.POST("/set_app_badge", t.SetAppBadge)
|
||||||
|
|
||||||
logs := thirdGroup.Group("/logs")
|
|
||||||
logs.POST("/upload", t.UploadLogs)
|
|
||||||
logs.POST("/delete", t.DeleteLogs)
|
|
||||||
logs.POST("/search", t.SearchLogs)
|
|
||||||
|
|
||||||
objectGroup := r.Group("/object", ParseToken)
|
objectGroup := r.Group("/object", ParseToken)
|
||||||
|
|
||||||
objectGroup.POST("/part_limit", t.PartLimit)
|
objectGroup.POST("/part_limit", t.PartLimit)
|
||||||
|
|||||||
@@ -105,16 +105,3 @@ func (o *ThirdApi) ObjectRedirect(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
c.Redirect(http.StatusFound, resp.Url)
|
c.Redirect(http.StatusFound, resp.Url)
|
||||||
}
|
}
|
||||||
|
|
||||||
// #################### logs ####################
|
|
||||||
func (o *ThirdApi) UploadLogs(c *gin.Context) {
|
|
||||||
a2r.Call(third.ThirdClient.UploadLogs, o.Client, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *ThirdApi) DeleteLogs(c *gin.Context) {
|
|
||||||
a2r.Call(third.ThirdClient.DeleteLogs, o.Client, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *ThirdApi) SearchLogs(c *gin.Context) {
|
|
||||||
a2r.Call(third.ThirdClient.SearchLogs, o.Client, c)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ const (
|
|||||||
PongMessage = 10
|
PongMessage = 10
|
||||||
)
|
)
|
||||||
|
|
||||||
type PingPongHandler func(string) error
|
type PongHandler func(string) error
|
||||||
|
|
||||||
type Client struct {
|
type Client struct {
|
||||||
w *sync.Mutex
|
w *sync.Mutex
|
||||||
@@ -107,12 +107,8 @@ func (c *Client) ResetClient(
|
|||||||
c.token = token
|
c.token = token
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) pingHandler(_ string) error {
|
func (c *Client) pongHandler(_ string) error {
|
||||||
c.conn.SetReadDeadline(pongWait)
|
c.conn.SetReadDeadline(pongWait)
|
||||||
err := c.writePongMsg()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -126,11 +122,10 @@ func (c *Client) readMessage() {
|
|||||||
}()
|
}()
|
||||||
c.conn.SetReadLimit(maxMessageSize)
|
c.conn.SetReadLimit(maxMessageSize)
|
||||||
_ = c.conn.SetReadDeadline(pongWait)
|
_ = c.conn.SetReadDeadline(pongWait)
|
||||||
c.conn.SetPingHandler(c.pingHandler)
|
c.conn.SetPongHandler(c.pongHandler)
|
||||||
for {
|
for {
|
||||||
messageType, message, returnErr := c.conn.ReadMessage()
|
messageType, message, returnErr := c.conn.ReadMessage()
|
||||||
if returnErr != nil {
|
if returnErr != nil {
|
||||||
log.ZWarn(c.ctx, "readMessage", returnErr, "messageType", messageType)
|
|
||||||
c.closedErr = returnErr
|
c.closedErr = returnErr
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ type LongConn interface {
|
|||||||
SetConnNil()
|
SetConnNil()
|
||||||
// SetReadLimit sets the maximum size for a message read from the peer.bytes
|
// SetReadLimit sets the maximum size for a message read from the peer.bytes
|
||||||
SetReadLimit(limit int64)
|
SetReadLimit(limit int64)
|
||||||
SetPongHandler(handler PingPongHandler)
|
SetPongHandler(handler PongHandler)
|
||||||
SetPingHandler(handler PingPongHandler)
|
|
||||||
// GenerateLongConn Check the connection of the current and when it was sent are the same
|
// GenerateLongConn Check the connection of the current and when it was sent are the same
|
||||||
GenerateLongConn(w http.ResponseWriter, r *http.Request) error
|
GenerateLongConn(w http.ResponseWriter, r *http.Request) error
|
||||||
}
|
}
|
||||||
@@ -117,12 +116,9 @@ func (d *GWebSocket) SetReadLimit(limit int64) {
|
|||||||
d.conn.SetReadLimit(limit)
|
d.conn.SetReadLimit(limit)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *GWebSocket) SetPongHandler(handler PingPongHandler) {
|
func (d *GWebSocket) SetPongHandler(handler PongHandler) {
|
||||||
d.conn.SetPongHandler(handler)
|
d.conn.SetPongHandler(handler)
|
||||||
}
|
}
|
||||||
func (d *GWebSocket) SetPingHandler(handler PingPongHandler) {
|
|
||||||
d.conn.SetPingHandler(handler)
|
|
||||||
}
|
|
||||||
|
|
||||||
//func (d *GWebSocket) CheckSendConnDiffNow() bool {
|
//func (d *GWebSocket) CheckSendConnDiffNow() bool {
|
||||||
// return d.conn == d.sendConn
|
// return d.conn == d.sendConn
|
||||||
|
|||||||
@@ -1,146 +0,0 @@
|
|||||||
package third
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"crypto/rand"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/OpenIMSDK/protocol/constant"
|
|
||||||
"github.com/OpenIMSDK/protocol/third"
|
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
|
||||||
"github.com/OpenIMSDK/tools/utils"
|
|
||||||
utils2 "github.com/OpenIMSDK/tools/utils"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/authverify"
|
|
||||||
relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
|
||||||
|
|
||||||
func genLogID() string {
|
|
||||||
const dataLen = 10
|
|
||||||
data := make([]byte, dataLen)
|
|
||||||
rand.Read(data)
|
|
||||||
chars := []byte("0123456789")
|
|
||||||
for i := 0; i < len(data); i++ {
|
|
||||||
if i == 0 {
|
|
||||||
data[i] = chars[1:][data[i]%9]
|
|
||||||
} else {
|
|
||||||
data[i] = chars[data[i]%10]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return string(data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *thirdServer) UploadLogs(ctx context.Context, req *third.UploadLogsReq) (*third.UploadLogsResp, error) {
|
|
||||||
var DBlogs []*relationtb.Log
|
|
||||||
userID := ctx.Value(constant.OpUserID).(string)
|
|
||||||
platform := constant.PlatformID2Name[int(req.Platform)]
|
|
||||||
for _, fileURL := range req.FileURLs {
|
|
||||||
log := relationtb.Log{
|
|
||||||
Version: req.Version,
|
|
||||||
SystemType: req.SystemType,
|
|
||||||
Platform: platform,
|
|
||||||
UserID: userID,
|
|
||||||
CreateTime: time.Now(),
|
|
||||||
Url: fileURL.URL,
|
|
||||||
FileName: fileURL.Filename,
|
|
||||||
}
|
|
||||||
for i := 0; i < 20; i++ {
|
|
||||||
id := genLogID()
|
|
||||||
logs, err := t.thirdDatabase.GetLogs(ctx, []string{id}, "")
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if len(logs) == 0 {
|
|
||||||
log.LogID = id
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if log.LogID == "" {
|
|
||||||
return nil, errs.ErrData.Wrap("Log id gen error")
|
|
||||||
}
|
|
||||||
DBlogs = append(DBlogs, &log)
|
|
||||||
}
|
|
||||||
err := t.thirdDatabase.UploadLogs(ctx, DBlogs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &third.UploadLogsResp{}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *thirdServer) DeleteLogs(ctx context.Context, req *third.DeleteLogsReq) (*third.DeleteLogsResp, error) {
|
|
||||||
|
|
||||||
if err := authverify.CheckAdmin(ctx); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
userID := ""
|
|
||||||
logs, err := t.thirdDatabase.GetLogs(ctx, req.LogIDs, userID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var logIDs []string
|
|
||||||
for _, log := range logs {
|
|
||||||
logIDs = append(logIDs, log.LogID)
|
|
||||||
}
|
|
||||||
if ids := utils2.Single(req.LogIDs, logIDs); len(ids) > 0 {
|
|
||||||
return nil, errs.ErrRecordNotFound.Wrap(fmt.Sprintf("logIDs not found%#v", ids))
|
|
||||||
}
|
|
||||||
err = t.thirdDatabase.DeleteLogs(ctx, req.LogIDs, userID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return &third.DeleteLogsResp{}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func dbToPbLogInfos(logs []*relationtb.Log) []*third.LogInfo {
|
|
||||||
db2pbForLogInfo := func(log *relationtb.Log) *third.LogInfo {
|
|
||||||
return &third.LogInfo{
|
|
||||||
Filename: log.FileName,
|
|
||||||
UserID: log.UserID,
|
|
||||||
Platform: utils.StringToInt32(log.Platform),
|
|
||||||
Url: log.Url,
|
|
||||||
CreateTime: log.CreateTime.UnixMilli(),
|
|
||||||
LogID: log.LogID,
|
|
||||||
SystemType: log.SystemType,
|
|
||||||
Version: log.Version,
|
|
||||||
Ex: log.Ex,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return utils.Slice(logs, db2pbForLogInfo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *thirdServer) SearchLogs(ctx context.Context, req *third.SearchLogsReq) (*third.SearchLogsResp, error) {
|
|
||||||
if err := authverify.CheckAdmin(ctx); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var (
|
|
||||||
resp third.SearchLogsResp
|
|
||||||
userIDs []string
|
|
||||||
)
|
|
||||||
if req.StartTime > req.EndTime {
|
|
||||||
return nil, errs.ErrArgs.Wrap("startTime>endTime")
|
|
||||||
}
|
|
||||||
total, logs, err := t.thirdDatabase.SearchLogs(ctx, req.Keyword, time.UnixMilli(req.StartTime), time.UnixMilli(req.EndTime), req.Pagination.PageNumber, req.Pagination.ShowNumber)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
pbLogs := dbToPbLogInfos(logs)
|
|
||||||
for _, log := range logs {
|
|
||||||
userIDs = append(userIDs, log.UserID)
|
|
||||||
}
|
|
||||||
users, err := t.thirdDatabase.FindUsers(ctx, userIDs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
IDtoName := make(map[string]string)
|
|
||||||
for _, user := range users {
|
|
||||||
IDtoName[user.UserID] = user.Nickname
|
|
||||||
}
|
|
||||||
for _, pbLog := range pbLogs {
|
|
||||||
pbLog.Nickname = IDtoName[pbLog.UserID]
|
|
||||||
}
|
|
||||||
resp.LogsInfos = pbLogs
|
|
||||||
resp.Total = total
|
|
||||||
return &resp, nil
|
|
||||||
}
|
|
||||||
@@ -35,7 +35,6 @@ import (
|
|||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/relation"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/relation"
|
||||||
relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -80,7 +79,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
|
|||||||
}
|
}
|
||||||
third.RegisterThirdServer(server, &thirdServer{
|
third.RegisterThirdServer(server, &thirdServer{
|
||||||
apiURL: apiURL,
|
apiURL: apiURL,
|
||||||
thirdDatabase: controller.NewThirdDatabase(cache.NewMsgCacheModel(rdb), db),
|
thirdDatabase: controller.NewThirdDatabase(cache.NewMsgCacheModel(rdb)),
|
||||||
userRpcClient: rpcclient.NewUserRpcClient(client),
|
userRpcClient: rpcclient.NewUserRpcClient(client),
|
||||||
s3dataBase: controller.NewS3Database(o, relation.NewObjectInfo(db)),
|
s3dataBase: controller.NewS3Database(o, relation.NewObjectInfo(db)),
|
||||||
defaultExpire: time.Hour * 24 * 7,
|
defaultExpire: time.Hour * 24 * 7,
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ type SendMsg struct {
|
|||||||
SessionType int32 `json:"sessionType" binding:"required"`
|
SessionType int32 `json:"sessionType" binding:"required"`
|
||||||
IsOnlineOnly bool `json:"isOnlineOnly"`
|
IsOnlineOnly bool `json:"isOnlineOnly"`
|
||||||
NotOfflinePush bool `json:"notOfflinePush"`
|
NotOfflinePush bool `json:"notOfflinePush"`
|
||||||
SendTime int64 `json:"sendTime"`
|
|
||||||
OfflinePushInfo *sdkws.OfflinePushInfo `json:"offlinePushInfo"`
|
OfflinePushInfo *sdkws.OfflinePushInfo `json:"offlinePushInfo"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -128,14 +128,12 @@ type configStruct struct {
|
|||||||
SecretAccessKey string `yaml:"secretAccessKey"`
|
SecretAccessKey string `yaml:"secretAccessKey"`
|
||||||
SessionToken string `yaml:"sessionToken"`
|
SessionToken string `yaml:"sessionToken"`
|
||||||
SignEndpoint string `yaml:"signEndpoint"`
|
SignEndpoint string `yaml:"signEndpoint"`
|
||||||
PublicRead bool `yaml:"publicRead"`
|
|
||||||
} `yaml:"minio"`
|
} `yaml:"minio"`
|
||||||
Cos struct {
|
Cos struct {
|
||||||
BucketURL string `yaml:"bucketURL"`
|
BucketURL string `yaml:"bucketURL"`
|
||||||
SecretID string `yaml:"secretID"`
|
SecretID string `yaml:"secretID"`
|
||||||
SecretKey string `yaml:"secretKey"`
|
SecretKey string `yaml:"secretKey"`
|
||||||
SessionToken string `yaml:"sessionToken"`
|
SessionToken string `yaml:"sessionToken"`
|
||||||
PublicRead bool `yaml:"publicRead"`
|
|
||||||
} `yaml:"cos"`
|
} `yaml:"cos"`
|
||||||
Oss struct {
|
Oss struct {
|
||||||
Endpoint string `yaml:"endpoint"`
|
Endpoint string `yaml:"endpoint"`
|
||||||
@@ -144,7 +142,6 @@ type configStruct struct {
|
|||||||
AccessKeyID string `yaml:"accessKeyID"`
|
AccessKeyID string `yaml:"accessKeyID"`
|
||||||
AccessKeySecret string `yaml:"accessKeySecret"`
|
AccessKeySecret string `yaml:"accessKeySecret"`
|
||||||
SessionToken string `yaml:"sessionToken"`
|
SessionToken string `yaml:"sessionToken"`
|
||||||
PublicRead bool `yaml:"publicRead"`
|
|
||||||
} `yaml:"oss"`
|
} `yaml:"oss"`
|
||||||
} `yaml:"object"`
|
} `yaml:"object"`
|
||||||
|
|
||||||
|
|||||||
Vendored
+13
-6
@@ -59,8 +59,11 @@ type ConversationCache interface {
|
|||||||
DelConversations(ownerUserID string, conversationIDs ...string) ConversationCache
|
DelConversations(ownerUserID string, conversationIDs ...string) ConversationCache
|
||||||
DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache
|
DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache
|
||||||
// get one conversation from msgCache
|
// get one conversation from msgCache
|
||||||
GetConversations(ctx context.Context, ownerUserID string,
|
GetConversations(
|
||||||
conversationIDs []string) ([]*relationtb.ConversationModel, error)
|
ctx context.Context,
|
||||||
|
ownerUserID string,
|
||||||
|
conversationIDs []string,
|
||||||
|
) ([]*relationtb.ConversationModel, error)
|
||||||
// get one user's all conversations from msgCache
|
// get one user's all conversations from msgCache
|
||||||
GetUserAllConversations(ctx context.Context, ownerUserID string) ([]*relationtb.ConversationModel, error)
|
GetUserAllConversations(ctx context.Context, ownerUserID string) ([]*relationtb.ConversationModel, error)
|
||||||
// get user conversation recv msg from msgCache
|
// get user conversation recv msg from msgCache
|
||||||
@@ -76,8 +79,10 @@ type ConversationCache interface {
|
|||||||
GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
|
GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
|
||||||
DelUserAllHasReadSeqs(ownerUserID string, conversationIDs ...string) ConversationCache
|
DelUserAllHasReadSeqs(ownerUserID string, conversationIDs ...string) ConversationCache
|
||||||
|
|
||||||
GetConversationsByConversationID(ctx context.Context,
|
GetConversationsByConversationID(
|
||||||
conversationIDs []string) ([]*relationtb.ConversationModel, error)
|
ctx context.Context,
|
||||||
|
conversationIDs []string,
|
||||||
|
) ([]*relationtb.ConversationModel, error)
|
||||||
DelConversationByConversationID(conversationIDs ...string) ConversationCache
|
DelConversationByConversationID(conversationIDs ...string) ConversationCache
|
||||||
GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error)
|
GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error)
|
||||||
DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache
|
DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache
|
||||||
@@ -413,8 +418,10 @@ func (c *ConversationRedisCache) GetUserAllHasReadSeqs(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ConversationRedisCache) DelUserAllHasReadSeqs(ownerUserID string,
|
func (c *ConversationRedisCache) DelUserAllHasReadSeqs(
|
||||||
conversationIDs ...string) ConversationCache {
|
ownerUserID string,
|
||||||
|
conversationIDs ...string,
|
||||||
|
) ConversationCache {
|
||||||
cache := c.NewCache()
|
cache := c.NewCache()
|
||||||
for _, conversationID := range conversationIDs {
|
for _, conversationID := range conversationIDs {
|
||||||
cache.AddKeys(c.getConversationHasReadSeqKey(ownerUserID, conversationID))
|
cache.AddKeys(c.getConversationHasReadSeqKey(ownerUserID, conversationID))
|
||||||
|
|||||||
@@ -16,60 +16,21 @@ package controller
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"time"
|
|
||||||
|
|
||||||
"gorm.io/gorm"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
|
||||||
dbimpl "github.com/openimsdk/open-im-server/v3/pkg/common/db/relation"
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type ThirdDatabase interface {
|
type ThirdDatabase interface {
|
||||||
FcmUpdateToken(ctx context.Context, account string, platformID int, fcmToken string, expireTime int64) error
|
FcmUpdateToken(ctx context.Context, account string, platformID int, fcmToken string, expireTime int64) error
|
||||||
SetAppBadge(ctx context.Context, userID string, value int) error
|
SetAppBadge(ctx context.Context, userID string, value int) error
|
||||||
//about log for debug
|
|
||||||
UploadLogs(ctx context.Context, logs []*relation.Log) error
|
|
||||||
DeleteLogs(ctx context.Context, logID []string, userID string) error
|
|
||||||
SearchLogs(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*relation.Log, error)
|
|
||||||
GetLogs(ctx context.Context, LogIDs []string, userID string) ([]*relation.Log, error)
|
|
||||||
FindUsers(ctx context.Context, userIDs []string) ([]*relation.UserModel, error)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type thirdDatabase struct {
|
type thirdDatabase struct {
|
||||||
cache cache.MsgModel
|
cache cache.MsgModel
|
||||||
logdb relation.LogInterface
|
|
||||||
userdb relation.UserModelInterface
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// FindUsers implements ThirdDatabase.
|
func NewThirdDatabase(cache cache.MsgModel) ThirdDatabase {
|
||||||
func (t *thirdDatabase) FindUsers(ctx context.Context, userIDs []string) ([]*relation.UserModel, error) {
|
return &thirdDatabase{cache: cache}
|
||||||
return t.userdb.Find(ctx, userIDs)
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteLogs implements ThirdDatabase.
|
|
||||||
func (t *thirdDatabase) DeleteLogs(ctx context.Context, logID []string, userID string) error {
|
|
||||||
return t.logdb.Delete(ctx, logID, userID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetLogs implements ThirdDatabase.
|
|
||||||
func (t *thirdDatabase) GetLogs(ctx context.Context, LogIDs []string, userID string) ([]*relation.Log, error) {
|
|
||||||
return t.logdb.Get(ctx, LogIDs, userID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SearchLogs implements ThirdDatabase.
|
|
||||||
func (t *thirdDatabase) SearchLogs(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*relation.Log, error) {
|
|
||||||
return t.logdb.Search(ctx, keyword, start, end, pageNumber, showNumber)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// UploadLogs implements ThirdDatabase.
|
|
||||||
func (t *thirdDatabase) UploadLogs(ctx context.Context, logs []*relation.Log) error {
|
|
||||||
return t.logdb.Create(ctx, logs)
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewThirdDatabase(cache cache.MsgModel, db *gorm.DB) ThirdDatabase {
|
|
||||||
return &thirdDatabase{cache: cache, logdb: dbimpl.NewLogGorm(db), userdb: dbimpl.NewUserGorm(db)}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *thirdDatabase) FcmUpdateToken(
|
func (t *thirdDatabase) FcmUpdateToken(
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
package relation
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/OpenIMSDK/tools/errs"
|
|
||||||
"github.com/OpenIMSDK/tools/ormutil"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
|
|
||||||
relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
|
|
||||||
)
|
|
||||||
|
|
||||||
type LogGorm struct {
|
|
||||||
db *gorm.DB
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LogGorm) Create(ctx context.Context, log []*relationtb.Log) error {
|
|
||||||
return errs.Wrap(l.db.WithContext(ctx).Create(log).Error)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LogGorm) Search(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*relationtb.Log, error) {
|
|
||||||
db := l.db.WithContext(ctx).Where("create_time >= ?", start)
|
|
||||||
if end.UnixMilli() != 0 {
|
|
||||||
db = l.db.WithContext(ctx).Where("create_time <= ?", end)
|
|
||||||
}
|
|
||||||
return ormutil.GormSearch[relationtb.Log](db, []string{"user_id"}, keyword, pageNumber, showNumber)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LogGorm) Delete(ctx context.Context, logIDs []string, userID string) error {
|
|
||||||
if userID == "" {
|
|
||||||
return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Delete(&relationtb.Log{}).Error)
|
|
||||||
}
|
|
||||||
return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Delete(&relationtb.Log{}).Error)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LogGorm) Get(ctx context.Context, logIDs []string, userID string) ([]*relationtb.Log, error) {
|
|
||||||
var logs []*relationtb.Log
|
|
||||||
if userID == "" {
|
|
||||||
return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Find(&logs).Error)
|
|
||||||
}
|
|
||||||
return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Find(&logs).Error)
|
|
||||||
}
|
|
||||||
func NewLogGorm(db *gorm.DB) relationtb.LogInterface {
|
|
||||||
db.AutoMigrate(&relationtb.Log{})
|
|
||||||
return &LogGorm{db: db}
|
|
||||||
}
|
|
||||||
@@ -288,7 +288,7 @@ func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration,
|
|||||||
style = append(style, "format/"+opt.Image.Format)
|
style = append(style, "format/"+opt.Image.Format)
|
||||||
}
|
}
|
||||||
if len(style) > 0 {
|
if len(style) > 0 {
|
||||||
imageMogr = "imageMogr2/thumbnail/" + strings.Join(style, "/") + "/ignore-error/1"
|
imageMogr = "&imageMogr2/thumbnail/" + strings.Join(style, "/") + "/ignore-error/1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if opt.ContentType != "" {
|
if opt.ContentType != "" {
|
||||||
@@ -306,23 +306,13 @@ func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration,
|
|||||||
} else if expire < time.Second {
|
} else if expire < time.Second {
|
||||||
expire = time.Second
|
expire = time.Second
|
||||||
}
|
}
|
||||||
rawURL, err := c.getPresignedURL(ctx, name, expire, &option)
|
rawURL, err := c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, &option)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
urlStr := rawURL.String()
|
||||||
if imageMogr != "" {
|
if imageMogr != "" {
|
||||||
if rawURL.RawQuery == "" {
|
urlStr += imageMogr
|
||||||
rawURL.RawQuery = imageMogr
|
|
||||||
} else {
|
|
||||||
rawURL.RawQuery = rawURL.RawQuery + "&" + imageMogr
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return rawURL.String(), nil
|
return urlStr, nil
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Cos) getPresignedURL(ctx context.Context, name string, expire time.Duration, opt *cos.PresignedURLOptions) (*url.URL, error) {
|
|
||||||
if !config.Config.Object.Cos.PublicRead {
|
|
||||||
return c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, opt)
|
|
||||||
}
|
|
||||||
return c.client.Object.GetObjectURL(name), nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// 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 cos // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cos"
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package cos
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"net/http"
|
|
||||||
"net/url"
|
|
||||||
_ "unsafe"
|
|
||||||
|
|
||||||
"github.com/tencentyun/cos-go-sdk-v5"
|
|
||||||
)
|
|
||||||
|
|
||||||
//go:linkname newRequest github.com/tencentyun/cos-go-sdk-v5.(*Client).newRequest
|
|
||||||
func newRequest(c *cos.Client, ctx context.Context, baseURL *url.URL, uri, method string, body interface{}, optQuery interface{}, optHeader interface{}) (req *http.Request, err error)
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// 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 minio // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/minio"
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package minio
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net/url"
|
|
||||||
_ "unsafe"
|
|
||||||
|
|
||||||
"github.com/minio/minio-go/v7"
|
|
||||||
)
|
|
||||||
|
|
||||||
//go:linkname makeTargetURL github.com/minio/minio-go/v7.(*Client).makeTargetURL
|
|
||||||
func makeTargetURL(client *minio.Client, bucketName, objectName, bucketLocation string, isVirtualHostStyle bool, queryValues url.Values) (*url.URL, error)
|
|
||||||
@@ -139,15 +139,6 @@ func (m *Minio) initMinio(ctx context.Context) error {
|
|||||||
return fmt.Errorf("make bucket error: %w", err)
|
return fmt.Errorf("make bucket error: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if conf.PublicRead {
|
|
||||||
policy := fmt.Sprintf(
|
|
||||||
`{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject","s3:PutObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::%s/*"],"Sid": ""}]}`,
|
|
||||||
conf.Bucket,
|
|
||||||
)
|
|
||||||
if err := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m.location, err = m.core.Client.GetBucketLocation(ctx, conf.Bucket)
|
m.location, err = m.core.Client.GetBucketLocation(ctx, conf.Bucket)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -384,15 +375,7 @@ func (m *Minio) presignedGetObject(ctx context.Context, name string, expire time
|
|||||||
} else if expire < time.Second {
|
} else if expire < time.Second {
|
||||||
expire = time.Second
|
expire = time.Second
|
||||||
}
|
}
|
||||||
var (
|
rawURL, err := m.sign.PresignedGetObject(ctx, m.bucket, name, expire, query)
|
||||||
rawURL *url.URL
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
if config.Config.Object.Minio.PublicRead {
|
|
||||||
rawURL, err = makeTargetURL(m.sign, m.bucket, name, m.location, false, query)
|
|
||||||
} else {
|
|
||||||
rawURL, err = m.sign.PresignedGetObject(ctx, m.bucket, name, expire, query)
|
|
||||||
}
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// 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 oss // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/oss"
|
||||||
@@ -20,7 +20,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"reflect"
|
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@@ -70,7 +69,6 @@ func NewOSS() (s3.Interface, error) {
|
|||||||
bucketURL: conf.BucketURL,
|
bucketURL: conf.BucketURL,
|
||||||
bucket: bucket,
|
bucket: bucket,
|
||||||
credentials: client.Config.GetCredentials(),
|
credentials: client.Config.GetCredentials(),
|
||||||
um: *(*urlMaker)(reflect.ValueOf(bucket.Client.Conn).Elem().FieldByName("url").UnsafePointer()),
|
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,7 +76,6 @@ type OSS struct {
|
|||||||
bucketURL string
|
bucketURL string
|
||||||
bucket *oss.Bucket
|
bucket *oss.Bucket
|
||||||
credentials oss.Credentials
|
credentials oss.Credentials
|
||||||
um urlMaker
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o *OSS) Engine() string {
|
func (o *OSS) Engine() string {
|
||||||
@@ -166,7 +163,7 @@ func (o *OSS) AuthSign(ctx context.Context, uploadID string, name string, expire
|
|||||||
request.Header.Set(oss.HTTPHeaderHost, request.Host)
|
request.Header.Set(oss.HTTPHeaderHost, request.Host)
|
||||||
request.Header.Set(oss.HTTPHeaderDate, now)
|
request.Header.Set(oss.HTTPHeaderDate, now)
|
||||||
request.Header.Set(oss.HttpHeaderOssDate, now)
|
request.Header.Set(oss.HttpHeaderOssDate, now)
|
||||||
signHeader(*o.bucket.Client.Conn, request, fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID))
|
ossSignHeader(o.bucket.Client.Conn, request, fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID))
|
||||||
delete(request.Header, oss.HTTPHeaderDate)
|
delete(request.Header, oss.HTTPHeaderDate)
|
||||||
result.Parts[i] = s3.SignPart{
|
result.Parts[i] = s3.SignPart{
|
||||||
PartNumber: partNumber,
|
PartNumber: partNumber,
|
||||||
@@ -275,7 +272,6 @@ func (o *OSS) ListUploadedParts(ctx context.Context, uploadID string, name strin
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
|
func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
|
||||||
publicRead := config.Config.Object.Oss.PublicRead
|
|
||||||
var opts []oss.Option
|
var opts []oss.Option
|
||||||
if opt != nil {
|
if opt != nil {
|
||||||
if opt.Image != nil {
|
if opt.Image != nil {
|
||||||
@@ -303,13 +299,11 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
|
|||||||
process += ",format," + format
|
process += ",format," + format
|
||||||
opts = append(opts, oss.Process(process))
|
opts = append(opts, oss.Process(process))
|
||||||
}
|
}
|
||||||
if !publicRead {
|
if opt.ContentType != "" {
|
||||||
if opt.ContentType != "" {
|
opts = append(opts, oss.ResponseContentType(opt.ContentType))
|
||||||
opts = append(opts, oss.ResponseContentType(opt.ContentType))
|
}
|
||||||
}
|
if opt.Filename != "" {
|
||||||
if opt.Filename != "" {
|
opts = append(opts, oss.ResponseContentDisposition(`attachment; filename=`+strconv.Quote(opt.Filename)))
|
||||||
opts = append(opts, oss.ResponseContentDisposition(`attachment; filename=`+strconv.Quote(opt.Filename)))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if expire <= 0 {
|
if expire <= 0 {
|
||||||
@@ -317,13 +311,5 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
|
|||||||
} else if expire < time.Second {
|
} else if expire < time.Second {
|
||||||
expire = time.Second
|
expire = time.Second
|
||||||
}
|
}
|
||||||
if !publicRead {
|
return o.bucket.SignURL(name, http.MethodGet, int64(expire/time.Second), opts...)
|
||||||
return o.bucket.SignURL(name, http.MethodGet, int64(expire/time.Second), opts...)
|
|
||||||
}
|
|
||||||
rawParams, err := oss.GetRawParams(opts)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
params := getURLParams(*o.bucket.Client.Conn, rawParams)
|
|
||||||
return getURL(o.um, o.bucket.BucketName, name, params).String(), nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,24 +16,10 @@ package oss
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
|
||||||
_ "unsafe"
|
_ "unsafe"
|
||||||
|
|
||||||
"github.com/aliyun/aliyun-oss-go-sdk/oss"
|
"github.com/aliyun/aliyun-oss-go-sdk/oss"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:linkname signHeader github.com/aliyun/aliyun-oss-go-sdk/oss.Conn.signHeader
|
//go:linkname ossSignHeader github.com/aliyun/aliyun-oss-go-sdk/oss.(*Conn).signHeader
|
||||||
func signHeader(c oss.Conn, req *http.Request, canonicalizedResource string)
|
func ossSignHeader(c *oss.Conn, req *http.Request, canonicalizedResource string)
|
||||||
|
|
||||||
//go:linkname getURLParams github.com/aliyun/aliyun-oss-go-sdk/oss.Conn.getURLParams
|
|
||||||
func getURLParams(c oss.Conn, params map[string]interface{}) string
|
|
||||||
|
|
||||||
//go:linkname getURL github.com/aliyun/aliyun-oss-go-sdk/oss.urlMaker.getURL
|
|
||||||
func getURL(um urlMaker, bucket, object, params string) *url.URL
|
|
||||||
|
|
||||||
type urlMaker struct {
|
|
||||||
Scheme string
|
|
||||||
NetLoc string
|
|
||||||
Type int
|
|
||||||
IsProxy bool
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package relation
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Log struct {
|
|
||||||
LogID string `gorm:"column:log_id;primary_key;type:char(64)"`
|
|
||||||
Platform string `gorm:"column:platform;type:varchar(32)"`
|
|
||||||
UserID string `gorm:"column:user_id;type:char(64)"`
|
|
||||||
CreateTime time.Time `gorm:"index:,sort:desc"`
|
|
||||||
Url string `gorm:"column:url;type varchar(255)"`
|
|
||||||
FileName string `gorm:"column:filename;type varchar(255)"`
|
|
||||||
SystemType string `gorm:"column:system_type;type varchar(255)"`
|
|
||||||
Version string `gorm:"column:version;type varchar(255)"`
|
|
||||||
Ex string `gorm:"column:ex;type varchar(255)"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type LogInterface interface {
|
|
||||||
Create(ctx context.Context, log []*Log) error
|
|
||||||
Search(ctx context.Context, keyword string, start time.Time, end time.Time, pageNumber int32, showNumber int32) (uint32, []*Log, error)
|
|
||||||
Delete(ctx context.Context, logID []string, userID string) error
|
|
||||||
Get(ctx context.Context, logIDs []string, userID string) ([]*Log, error)
|
|
||||||
}
|
|
||||||
@@ -62,6 +62,7 @@ echo "+++ The port being checked: ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]}"
|
|||||||
|
|
||||||
set +e
|
set +e
|
||||||
|
|
||||||
|
# Later, after discarding Docker, the Docker keyword is unreliable, and Kubepods is used
|
||||||
if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then
|
if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then
|
||||||
openim::color::echo ${COLOR_BLUE} "Environment in the interior of the container"
|
openim::color::echo ${COLOR_BLUE} "Environment in the interior of the container"
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ source "${OPENIM_ROOT}/scripts/lib/init.sh"
|
|||||||
trap 'openim::util::onCtrlC' INT
|
trap 'openim::util::onCtrlC' INT
|
||||||
|
|
||||||
chmod +x "${OPENIM_ROOT}"/scripts/*.sh
|
chmod +x "${OPENIM_ROOT}"/scripts/*.sh
|
||||||
"${OPENIM_ROOT}"/scripts/init-config.sh
|
|
||||||
|
|
||||||
openim::util::ensure_docker_daemon_connectivity
|
openim::util::ensure_docker_daemon_connectivity
|
||||||
|
|
||||||
@@ -40,10 +39,12 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
pushd "${OPENIM_ROOT}"
|
pushd "${OPENIM_ROOT}"
|
||||||
|
${DOCKER_COMPOSE_COMMAND} stop
|
||||||
${DOCKER_COMPOSE_COMMAND} up -d
|
curl https://gitee.com/openimsdk/openim-docker/raw/main/example/full-openim-server-and-chat.yml -o docker-compose.yml && make init && docker compose up -d
|
||||||
|
"${OPENIM_ROOT}"/scripts/init-config.sh
|
||||||
|
${DOCKER_COMPOSE_COMMAND} up --remove-orphans -d
|
||||||
sleep 60
|
sleep 60
|
||||||
${DOCKER_COMPOSE_COMMAND} logs
|
${DOCKER_COMPOSE_COMMAND} logs openim-server
|
||||||
${DOCKER_COMPOSE_COMMAND} ps
|
${DOCKER_COMPOSE_COMMAND} ps
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|||||||
@@ -69,6 +69,15 @@ def "ENV_FILE" ""${OPENIM_ROOT}"/scripts/install/environment.sh"
|
|||||||
def "CHAT_BRANCH" "main"
|
def "CHAT_BRANCH" "main"
|
||||||
def "SERVER_BRANCH" "main"
|
def "SERVER_BRANCH" "main"
|
||||||
|
|
||||||
|
# Choose the appropriate image address, the default is GITHUB image,
|
||||||
|
# you can choose docker hub, for Chinese users can choose Ali Cloud
|
||||||
|
# export IMAGE_REGISTRY="ghcr.io/openimsdk"
|
||||||
|
# export IMAGE_REGISTRY="openim"
|
||||||
|
# export IMAGE_REGISTRY="registry.cn-hangzhou.aliyuncs.com/openimsdk"
|
||||||
|
def "IMAGE_REGISTRY" "ghcr.io/openimsdk"
|
||||||
|
# def "IMAGE_REGISTRY" "openim"
|
||||||
|
# def "IMAGE_REGISTRY" "registry.cn-hangzhou.aliyuncs.com/openimsdk"
|
||||||
|
|
||||||
###################### OpenIM Docker Network ######################
|
###################### OpenIM Docker Network ######################
|
||||||
# 设置 Docker 网络的网段
|
# 设置 Docker 网络的网段
|
||||||
readonly DOCKER_BRIDGE_SUBNET=${DOCKER_BRIDGE_SUBNET:-'172.28.0.0/16'}
|
readonly DOCKER_BRIDGE_SUBNET=${DOCKER_BRIDGE_SUBNET:-'172.28.0.0/16'}
|
||||||
@@ -186,21 +195,17 @@ def "MINIO_ACCESS_KEY" "${USER}"
|
|||||||
def "MINIO_SECRET_KEY" "${PASSWORD}" # MinIO的密钥
|
def "MINIO_SECRET_KEY" "${PASSWORD}" # MinIO的密钥
|
||||||
def "MINIO_SESSION_TOKEN" # MinIO的会话令牌
|
def "MINIO_SESSION_TOKEN" # MinIO的会话令牌
|
||||||
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址
|
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址
|
||||||
def "MINIO_PUBLIC_READ" "false" # 公有读
|
|
||||||
|
|
||||||
# 腾讯云COS的存储桶URL
|
# 腾讯云COS的存储桶URL
|
||||||
def "COS_BUCKET_URL" "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
|
def "COS_BUCKET_URL" "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
|
||||||
def "COS_SECRET_ID" # 腾讯云COS的密钥ID
|
def "COS_SECRET_ID" # 腾讯云COS的密钥ID
|
||||||
def "COS_SECRET_KEY" # 腾讯云COS的密钥
|
def "COS_SECRET_KEY" # 腾讯云COS的密钥
|
||||||
def "COS_SESSION_TOKEN" # 腾讯云COS的会话令牌
|
def "COS_SESSION_TOKEN" # 腾讯云COS的会话令牌
|
||||||
def "COS_PUBLIC_READ" "false" # 公有读
|
|
||||||
def "OSS_ENDPOINT" "https://oss-cn-chengdu.aliyuncs.com" # 阿里云OSS的端点URL
|
def "OSS_ENDPOINT" "https://oss-cn-chengdu.aliyuncs.com" # 阿里云OSS的端点URL
|
||||||
def "OSS_BUCKET" "demo-9999999" # 阿里云OSS的存储桶名称
|
def "OSS_BUCKET" "demo-9999999" # 阿里云OSS的存储桶名称
|
||||||
def "OSS_BUCKET_URL" "https://demo-9999999.oss-cn-chengdu.aliyuncs.com" # 阿里云OSS的存储桶URL
|
def "OSS_BUCKET_URL" "https://demo-9999999.oss-cn-chengdu.aliyuncs.com" # 阿里云OSS的存储桶URL
|
||||||
def "OSS_ACCESS_KEY_ID" # 阿里云OSS的访问密钥ID
|
def "OSS_ACCESS_KEY_ID" # 阿里云OSS的访问密钥ID
|
||||||
def "OSS_ACCESS_KEY_SECRET" # 阿里云OSS的密钥
|
def "OSS_ACCESS_KEY_SECRET" # 阿里云OSS的密钥
|
||||||
def "OSS_SESSION_TOKEN" # 阿里云OSS的会话令牌
|
def "OSS_SESSION_TOKEN" # 阿里云OSS的会话令牌
|
||||||
def "OSS_PUBLIC_READ" "false" # 公有读
|
|
||||||
|
|
||||||
###################### Redis 配置信息 ######################
|
###################### Redis 配置信息 ######################
|
||||||
def "REDIS_PORT" "16379" # Redis的端口
|
def "REDIS_PORT" "16379" # Redis的端口
|
||||||
@@ -289,11 +294,16 @@ def "WEBSOCKET_TIMEOUT" "10" # Websocket超时
|
|||||||
def "PUSH_ENABLE" "getui" # 推送是否启用
|
def "PUSH_ENABLE" "getui" # 推送是否启用
|
||||||
# GeTui推送URL
|
# GeTui推送URL
|
||||||
readonly GETUI_PUSH_URL=${GETUI_PUSH_URL:-'https://restapi.getui.com/v2/$appId'}
|
readonly GETUI_PUSH_URL=${GETUI_PUSH_URL:-'https://restapi.getui.com/v2/$appId'}
|
||||||
|
def "GETUI_MASTER_SECRET" "" # GeTui主密钥
|
||||||
|
def "GETUI_APP_KEY" "" # GeTui应用密钥
|
||||||
|
def "GETUI_INTENT" "" # GeTui推送意图
|
||||||
|
def "GETUI_CHANNEL_ID" "" # GeTui渠道ID
|
||||||
|
def "GETUI_CHANNEL_NAME" "" # GeTui渠道名称
|
||||||
def "FCM_SERVICE_ACCOUNT" "x.json" # FCM服务账户
|
def "FCM_SERVICE_ACCOUNT" "x.json" # FCM服务账户
|
||||||
def "JPNS_APP_KEY" # JPNS应用密钥
|
def "JPNS_APP_KEY" "" # JPNS应用密钥
|
||||||
def "JPNS_MASTER_SECRET" # JPNS主密钥
|
def "JPNS_MASTER_SECRET" "" # JPNS主密钥
|
||||||
def "JPNS_PUSH_URL" # JPNS推送URL
|
def "JPNS_PUSH_URL" "" # JPNS推送URL
|
||||||
def "JPNS_PUSH_INTENT" # JPNS推送意图
|
def "JPNS_PUSH_INTENT" "" # JPNS推送意图
|
||||||
def "MANAGER_USERID_1" "openIM123456" # 管理员ID 1
|
def "MANAGER_USERID_1" "openIM123456" # 管理员ID 1
|
||||||
def "MANAGER_USERID_2" "openIM654321" # 管理员ID 2
|
def "MANAGER_USERID_2" "openIM654321" # 管理员ID 2
|
||||||
def "MANAGER_USERID_3" "openIMAdmin" # 管理员ID 3
|
def "MANAGER_USERID_3" "openIMAdmin" # 管理员ID 3
|
||||||
|
|||||||
@@ -54,14 +54,14 @@ function openim::push::start()
|
|||||||
openim::log::status "Start OpenIM Push, binary root: ${SERVER_NAME}"
|
openim::log::status "Start OpenIM Push, binary root: ${SERVER_NAME}"
|
||||||
openim::log::info "Start OpenIM Push, path: ${OPENIM_PUSH_BINARY}"
|
openim::log::info "Start OpenIM Push, path: ${OPENIM_PUSH_BINARY}"
|
||||||
|
|
||||||
openim::util::stop_services_with_name ${SERVER_NAME}
|
|
||||||
|
|
||||||
openim::log::status "prepare start push process, path: ${OPENIM_PUSH_BINARY}"
|
openim::log::status "prepare start push process, path: ${OPENIM_PUSH_BINARY}"
|
||||||
openim::log::status "prepare start push process, port: ${OPENIM_PUSH_PORT}, prometheus port: ${PUSH_PROM_PORT}"
|
openim::log::status "prepare start push process, port: ${OPENIM_PUSH_PORT}, prometheus port: ${PUSH_PROM_PORT}"
|
||||||
|
|
||||||
OPENIM_PUSH_PORTS_ARRAY=$(openim::util::list-to-string ${OPENIM_PUSH_PORT} )
|
OPENIM_PUSH_PORTS_ARRAY=$(openim::util::list-to-string ${OPENIM_PUSH_PORT} )
|
||||||
PUSH_PROM_PORTS_ARRAY=$(openim::util::list-to-string ${PUSH_PROM_PORT} )
|
PUSH_PROM_PORTS_ARRAY=$(openim::util::list-to-string ${PUSH_PROM_PORT} )
|
||||||
|
|
||||||
|
openim::util::stop_services_with_name ${SERVER_NAME}
|
||||||
|
|
||||||
openim::log::status "push port list: ${OPENIM_PUSH_PORTS_ARRAY[@]}"
|
openim::log::status "push port list: ${OPENIM_PUSH_PORTS_ARRAY[@]}"
|
||||||
openim::log::status "prometheus port list: ${PUSH_PROM_PORTS_ARRAY[@]}"
|
openim::log::status "prometheus port list: ${PUSH_PROM_PORTS_ARRAY[@]}"
|
||||||
|
|
||||||
@@ -94,7 +94,7 @@ function openim::push::install()
|
|||||||
|
|
||||||
# 1. Build openim-push
|
# 1. Build openim-push
|
||||||
make build BINS=${SERVER_NAME}
|
make build BINS=${SERVER_NAME}
|
||||||
openim::common::sudo "cp ${OPENIM_OUTPUT_HOSTBIN}/${SERVER_NAME} ${OPENIM_INSTALL_DIR}/bin"
|
openim::common::sudo "cp -r ${OPENIM_OUTPUT_HOSTBIN}/${SERVER_NAME} ${OPENIM_INSTALL_DIR}/bin"
|
||||||
|
|
||||||
openim::log::status "${SERVER_NAME} binary: ${OPENIM_INSTALL_DIR}/bin/${SERVER_NAME}"
|
openim::log::status "${SERVER_NAME} binary: ${OPENIM_INSTALL_DIR}/bin/${SERVER_NAME}"
|
||||||
|
|
||||||
@@ -150,4 +150,4 @@ function openim::push::status()
|
|||||||
|
|
||||||
if [[ "$*" =~ openim::push:: ]];then
|
if [[ "$*" =~ openim::push:: ]];then
|
||||||
eval $*
|
eval $*
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/minio/minio-go/v7"
|
"github.com/minio/minio-go/v7"
|
||||||
@@ -116,24 +117,16 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkMinioIP() error {
|
func exactIP(urll string) string {
|
||||||
for _, i := range []string{config.Config.Object.ApiURL, config.Config.Object.Minio.SignEndpoint} {
|
u, _ := url.Parse(urll)
|
||||||
u, err := url.Parse(i)
|
host, _, err := net.SplitHostPort(u.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return utils.Wrap(err, "api format error,please check config file apiURL or Minio SignEndpoint")
|
host = u.Host
|
||||||
}
|
|
||||||
if u.Scheme == "https" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
host, _, err := net.SplitHostPort(u.Host)
|
|
||||||
if err != nil {
|
|
||||||
host = u.Host
|
|
||||||
}
|
|
||||||
if host == "127.0.0.1" {
|
|
||||||
return ErrConfig.Wrap("apiURL or Minio SignEndpoint endpoint contain 127.0.0.1,please modify it")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return nil
|
if strings.HasSuffix(host, ":") {
|
||||||
|
host = host[0 : len(host)-1]
|
||||||
|
}
|
||||||
|
return host
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkMysql() error {
|
func checkMysql() error {
|
||||||
@@ -212,8 +205,8 @@ func checkMinio() error {
|
|||||||
return ErrComponentStart.Wrap("Minio server is offline")
|
return ErrComponentStart.Wrap("Minio server is offline")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if checkMinioIP() != nil {
|
if exactIP(config.Config.Object.ApiURL) == "127.0.0.1" || exactIP(config.Config.Object.Minio.SignEndpoint) == "127.0.0.1" {
|
||||||
return checkMinioIP()
|
return ErrConfig.Wrap("apiURL or Minio SignEndpoint endpoint contain 127.0.0.1")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
+2
-3
@@ -1,4 +1,4 @@
|
|||||||
module github.com/openimsdk/open-im-server/v3/tools/imctl
|
module github.com/openimsdk/open-im-server/v3/tools/imctl
|
||||||
|
|
||||||
go 1.18
|
go 1.18
|
||||||
|
|
||||||
@@ -14,6 +14,5 @@ require (
|
|||||||
require (
|
require (
|
||||||
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
|
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||||
golang.org/x/sys v0.10.0 // indirect
|
golang.org/x/sys v0.1.0 // indirect
|
||||||
k8s.io/kubernetes v1.28.2
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -20,8 +20,5 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
|
|||||||
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
||||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
k8s.io/kubernetes v1.28.2 h1:GhcnYeNTukeaC0dD5BC+UWBvzQsFEpWj7XBVMQptfYc=
|
|
||||||
k8s.io/kubernetes v1.28.2/go.mod h1:FmB1Mlp9ua0ezuwQCTGs/y6wj/fVisN2sVxhzjj0WDk=
|
|
||||||
|
|||||||
Reference in New Issue
Block a user