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

fix #2860 migrate jpns to jpush (#2861)

Browse Source
This commit is contained in:
Wiky Lyu 2024-11-19 09:59:21 +08:00 committed by GitHub
parent 8471a0ef3b
commit 1df49ee718
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/openim-push.yml
View File

@ -26,7 +26,7 @@ fcm:
# Prioritize using file paths. If the file path is empty, use URL # Prioritize using file paths. If the file path is empty, use URL
filePath: # File path is concatenated with the parameters passed in through - c(`mage` default pass in `config/`) and filePath. filePath: # File path is concatenated with the parameters passed in through - c(`mage` default pass in `config/`) and filePath.
authURL: # Must start with https or http. authURL: # Must start with https or http.
jpns: jpush:
appKey: appKey:
masterSecret: masterSecret:
pushURL: pushURL:

10
deployments/templates/config.yaml
View File

@ -240,11 +240,11 @@ push:
channelName: ${GETUI_CHANNEL_NAME} channelName: ${GETUI_CHANNEL_NAME}
fcm: fcm:
serviceAccount: "${FCM_SERVICE_ACCOUNT}" serviceAccount: "${FCM_SERVICE_ACCOUNT}"
jpns: jpush:
appKey: ${JPNS_APP_KEY} appKey: ${JPUSH_APP_KEY}
masterSecret: ${JPNS_MASTER_SECRET} masterSecret: ${JPUSH_MASTER_SECRET}
pushUrl: ${JPNS_PUSH_URL} pushUrl: ${JPUSH_PUSH_URL}
pushIntent: ${JPNS_PUSH_INTENT} pushIntent: ${JPUSH_PUSH_INTENT}
# App manager configuration # App manager configuration
# #

8
docs/contrib/environment.md
View File

@ -474,10 +474,10 @@ This section involves setting up additional configuration variables for Websocke
| GETUI_CHANNEL_ID | [User Defined] | GeTui Channel ID | | GETUI_CHANNEL_ID | [User Defined] | GeTui Channel ID |
| GETUI_CHANNEL_NAME | [User Defined] | GeTui Channel Name | | GETUI_CHANNEL_NAME | [User Defined] | GeTui Channel Name |
| FCM_SERVICE_ACCOUNT | "x.json" | FCM Service Account | | FCM_SERVICE_ACCOUNT | "x.json" | FCM Service Account |
| JPNS_APP_KEY | [User Defined] | JPNS Application Key | | JPUSH_APP_KEY | [User Defined] | JPUSH Application Key |
| JPNS_MASTER_SECRET | [User Defined] | JPNS Master Secret | | JPUSH_MASTER_SECRET | [User Defined] | JPUSH Master Secret |
| JPNS_PUSH_URL | [User Defined] | JPNS Push Notification URL | | JPUSH_PUSH_URL | [User Defined] | JPUSH Push Notification URL |
| JPNS_PUSH_INTENT | [User Defined] | JPNS Push Intent | | JPUSH_PUSH_INTENT | [User Defined] | JPUSH Push Intent |
| IM_ADMIN_USERID | "imAdmin" | IM Administrator ID | | IM_ADMIN_USERID | "imAdmin" | IM Administrator ID |
| IM_ADMIN_NAME | "imAdmin" | IM Administrator Nickname | | IM_ADMIN_NAME | "imAdmin" | IM Administrator Nickname |
| MULTILOGIN_POLICY | "1" | Multi-login Policy | | MULTILOGIN_POLICY | "1" | Multi-login Policy |

2
internal/push/offlinepush/jpush/body/notification.go
View File

@ -64,7 +64,7 @@ func (n *Notification) SetExtras(extras map[string]string) {
} }
func (n *Notification) SetAndroidIntent(pushConf *config.Push) { func (n *Notification) SetAndroidIntent(pushConf *config.Push) {
n.Android.Intent.URL = pushConf.JPNS.PushIntent n.Android.Intent.URL = pushConf.JPush.PushIntent
} }
func (n *Notification) IOSEnableMutableContent() { func (n *Notification) IOSEnableMutableContent() {

4
internal/push/offlinepush/jpush/push.go
View File

@ -89,9 +89,9 @@ func (j *JPush) Push(ctx context.Context, userIDs []string, title, content strin
func (j *JPush) request(ctx context.Context, po body.PushObj, resp *map[string]any, timeout int) error { func (j *JPush) request(ctx context.Context, po body.PushObj, resp *map[string]any, timeout int) error {
err := j.httpClient.PostReturn( err := j.httpClient.PostReturn(
ctx, ctx,
j.pushConf.JPNS.PushURL, j.pushConf.JPush.PushURL,
map[string]string{ map[string]string{
"Authorization": j.getAuthorization(j.pushConf.JPNS.AppKey, j.pushConf.JPNS.MasterSecret), "Authorization": j.getAuthorization(j.pushConf.JPush.AppKey, j.pushConf.JPush.MasterSecret),
}, },
po, po,
resp, resp,

4
pkg/common/config/config.go
View File

@ -213,12 +213,12 @@ type Push struct {
FilePath string `mapstructure:"filePath"` FilePath string `mapstructure:"filePath"`
AuthURL string `mapstructure:"authURL"` AuthURL string `mapstructure:"authURL"`
} `mapstructure:"fcm"` } `mapstructure:"fcm"`
JPNS struct { JPush struct {
AppKey string `mapstructure:"appKey"` AppKey string `mapstructure:"appKey"`
MasterSecret string `mapstructure:"masterSecret"` MasterSecret string `mapstructure:"masterSecret"`
PushURL string `mapstructure:"pushURL"` PushURL string `mapstructure:"pushURL"`
PushIntent string `mapstructure:"pushIntent"` PushIntent string `mapstructure:"pushIntent"`
} `mapstructure:"jpns"` } `mapstructure:"jpush"`
IOSPush struct { IOSPush struct {
PushSound string `mapstructure:"pushSound"` PushSound string `mapstructure:"pushSound"`
BadgeCount bool `mapstructure:"badgeCount"` BadgeCount bool `mapstructure:"badgeCount"`