blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-04 19:32:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:openimsdk/open-im-server into refactor/parse-token

Browse Source
This commit is contained in:
Monet Lee 2024-07-28 10:16:24 +08:00
commit 567ceaf815
3 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.github/workflows/build-docker-image.yml vendored
View File

@ -121,29 +121,29 @@ jobs:
exit 0 exit 0
fi fi
- name: Checkout e2e # - name: Checkout e2e
if: success() # if: success()
uses: actions/checkout@v4 # uses: actions/checkout@v4
with: # with:
repository: "openimsdk/test-e2e" # repository: "openimsdk/test-e2e"
path: e2e-repo # path: e2e-repo
- name: Set up Python 3.9 # - name: Set up Python 3.9
uses: actions/setup-python@v4 # uses: actions/setup-python@v4
with: # with:
python-version: '3.9' # python-version: '3.9'
- name: Install dependencies # - name: Install dependencies
run: | # run: |
sudo apt-get update # sudo apt-get update
sudo apt-get install -y xvfb libxi6 libgconf-2-4 # sudo apt-get install -y xvfb libxi6 libgconf-2-4
cd ${{ github.workspace }}/e2e-repo # cd ${{ github.workspace }}/e2e-repo
pip install -r requirements.txt # pip install -r requirements.txt
- name: Run tests # - name: Run tests
run: | # run: |
cd ${{ github.workspace }}/e2e-repo # cd ${{ github.workspace }}/e2e-repo
xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' pytest -v -s ./script # xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' pytest -v -s ./script
- name: Extract metadata (tags, labels) for Docker - name: Extract metadata (tags, labels) for Docker
if: success() if: success()

58
.github/workflows/openimci.yml vendored
View File

@ -71,17 +71,17 @@ jobs:
run: sudo bash bootstrap.sh run: sudo bash bootstrap.sh
timeout-minutes: 20 timeout-minutes: 20
- name: Get Internal IP Address # - name: Get Internal IP Address
id: get-ip # id: get-ip
run: | # run: |
IP=$(hostname -I | awk '{print $1}') # IP=$(hostname -I | awk '{print $1}')
echo "The IP Address is: $IP" # echo "The IP Address is: $IP"
echo "::set-output name=ip::$IP" # echo "::set-output name=ip::$IP"
- name: Update .env # - name: Update .env
run: | # run: |
sed -i 's|externalAddress:.*|externalAddress: "http://${{ steps.get-ip.outputs.ip }}:10005"|' config/minio.yml # sed -i 's|externalAddress:.*|externalAddress: "http://${{ steps.get-ip.outputs.ip }}:10005"|' config/minio.yml
cat config/minio.yml # cat config/minio.yml
- name: Build, Start, Check Services and Print Logs for Linux - name: Build, Start, Check Services and Print Logs for Linux
run: | run: |
@ -109,27 +109,27 @@ jobs:
sudo mage start sudo mage start
sudo mage check sudo mage check
- name: Checkout e2e repository # - name: Checkout e2e repository
uses: actions/checkout@v4 # uses: actions/checkout@v4
with: # with:
repository: "openimsdk/test-e2e" # repository: "openimsdk/test-e2e"
path: e2e-repo # path: e2e-repo
- name: Set up Python 3.9 # - name: Set up Python 3.9
uses: actions/setup-python@v4 # uses: actions/setup-python@v4
with: # with:
python-version: '3.9' # python-version: '3.9'
- name: Install dependencies # - name: Install dependencies
run: | # run: |
sudo apt-get update # sudo apt-get update
sudo apt-get install -y xvfb libxi6 libgconf-2-4 # sudo apt-get install -y xvfb libxi6 libgconf-2-4
cd ${{ github.workspace }}/e2e-repo # cd ${{ github.workspace }}/e2e-repo
pip install -r requirements.txt # pip install -r requirements.txt
- name: Run tests # - name: Run tests
run: | # run: |
cd ${{ github.workspace }}/e2e-repo # cd ${{ github.workspace }}/e2e-repo
xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' pytest -v -s ./script # xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' pytest -v -s ./script

4
pkg/rpcclient/msg.go
View File

@ -324,6 +324,10 @@ func (s *NotificationSender) send(ctx context.Context, sendID, recvID string, co
options := config.GetOptionsByNotification(optionsConfig) options := config.GetOptionsByNotification(optionsConfig)
s.SetOptionsByContentType(ctx, options, contentType) s.SetOptionsByContentType(ctx, options, contentType)
msg.Options = options msg.Options = options
// fill Notification OfflinePush by config
offlineInfo.Title = optionsConfig.OfflinePush.Title
offlineInfo.Desc = optionsConfig.OfflinePush.Desc
offlineInfo.Ex = optionsConfig.OfflinePush.Ext
msg.OfflinePushInfo = &offlineInfo msg.OfflinePushInfo = &offlineInfo
req.MsgData = &msg req.MsgData = &msg
_, err = s.sendMsg(ctx, &req) _, err = s.sendMsg(ctx, &req)