通用CP接口
This commit is contained in:
parent
747d4700df
commit
e4911e7732
@ -8,6 +8,12 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
cpRelationBroadcastMQConsumerGroup = "cp-relation-broadcast"
|
||||||
|
cpRelationBroadcastMQTopic = "RC_DEFAULT_APP_ORDINARY"
|
||||||
|
cpRelationBroadcastMQTag = "cp_relation_broadcast"
|
||||||
|
)
|
||||||
|
|
||||||
// Config 是按运行层和业务模块分段后的应用配置。
|
// Config 是按运行层和业务模块分段后的应用配置。
|
||||||
type Config struct {
|
type Config struct {
|
||||||
HTTP HTTPConfig
|
HTTP HTTPConfig
|
||||||
@ -311,9 +317,12 @@ func Load() Config {
|
|||||||
voiceRoomRocketMQEndpoint := getEnvAny([]string{"CHATAPP_VOICE_ROOM_ROCKET_MQ_ENDPOINT", "LIKEI_ROCKETMQ_ENDPOINT"}, "")
|
voiceRoomRocketMQEndpoint := getEnvAny([]string{"CHATAPP_VOICE_ROOM_ROCKET_MQ_ENDPOINT", "LIKEI_ROCKETMQ_ENDPOINT"}, "")
|
||||||
voiceRoomRocketMQAccessKey := getEnvAny([]string{"CHATAPP_VOICE_ROOM_ROCKET_MQ_ACCESS_KEY", "LIKEI_ROCKETMQ_ACCESS_KEY"}, "")
|
voiceRoomRocketMQAccessKey := getEnvAny([]string{"CHATAPP_VOICE_ROOM_ROCKET_MQ_ACCESS_KEY", "LIKEI_ROCKETMQ_ACCESS_KEY"}, "")
|
||||||
voiceRoomRocketMQAccessSecret := getEnvAny([]string{"CHATAPP_VOICE_ROOM_ROCKET_MQ_ACCESS_SECRET", "LIKEI_ROCKETMQ_SECRET_KEY"}, "")
|
voiceRoomRocketMQAccessSecret := getEnvAny([]string{"CHATAPP_VOICE_ROOM_ROCKET_MQ_ACCESS_SECRET", "LIKEI_ROCKETMQ_SECRET_KEY"}, "")
|
||||||
cpRelationBroadcastMQEndpoint := getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_ENDPOINT", "CP_RELATION_BROADCAST_MQ_ENDPOINT", "LIKEI_ROCKETMQ_ENDPOINT"}, "")
|
cpRelationBroadcastMQEndpoint := getEnvAny([]string{"LIKEI_ROCKETMQ_ENDPOINT", "CHATAPP_TASK_CENTER_MQ_ENDPOINT", "TASK_CENTER_EVENT_MQ_ENDPOINT"}, "")
|
||||||
cpRelationBroadcastMQAccessKey := getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_ACCESS_KEY", "CP_RELATION_BROADCAST_MQ_ACCESS_KEY", "LIKEI_ROCKETMQ_ACCESS_KEY"}, "")
|
cpRelationBroadcastMQAccessKey := getEnvAny([]string{"LIKEI_ROCKETMQ_ACCESS_KEY", "CHATAPP_TASK_CENTER_MQ_ACCESS_KEY", "TASK_CENTER_EVENT_MQ_ACCESS_KEY"}, "")
|
||||||
cpRelationBroadcastMQAccessSecret := getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_ACCESS_SECRET", "CP_RELATION_BROADCAST_MQ_SECRET_KEY", "LIKEI_ROCKETMQ_SECRET_KEY"}, "")
|
cpRelationBroadcastMQAccessSecret := getEnvAny([]string{"LIKEI_ROCKETMQ_SECRET_KEY", "CHATAPP_TASK_CENTER_MQ_ACCESS_SECRET", "TASK_CENTER_EVENT_MQ_SECRET_KEY"}, "")
|
||||||
|
cpRelationBroadcastMQEnabled := strings.TrimSpace(cpRelationBroadcastMQEndpoint) != "" &&
|
||||||
|
strings.TrimSpace(cpRelationBroadcastMQAccessKey) != "" &&
|
||||||
|
strings.TrimSpace(cpRelationBroadcastMQAccessSecret) != ""
|
||||||
|
|
||||||
return Config{
|
return Config{
|
||||||
HTTP: HTTPConfig{
|
HTTP: HTTPConfig{
|
||||||
@ -555,15 +564,15 @@ func Load() Config {
|
|||||||
"LIKEI",
|
"LIKEI",
|
||||||
)),
|
)),
|
||||||
MQ: CPRelationBroadcastMQConfig{
|
MQ: CPRelationBroadcastMQConfig{
|
||||||
Enabled: getEnvBoolAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_ENABLED", "CP_RELATION_BROADCAST_MQ_ENABLED"}, false),
|
Enabled: cpRelationBroadcastMQEnabled,
|
||||||
Endpoint: cpRelationBroadcastMQEndpoint,
|
Endpoint: cpRelationBroadcastMQEndpoint,
|
||||||
Namespace: getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_NAMESPACE", "CP_RELATION_BROADCAST_MQ_NAMESPACE"}, ""),
|
Namespace: "",
|
||||||
AccessKey: cpRelationBroadcastMQAccessKey,
|
AccessKey: cpRelationBroadcastMQAccessKey,
|
||||||
AccessSecret: cpRelationBroadcastMQAccessSecret,
|
AccessSecret: cpRelationBroadcastMQAccessSecret,
|
||||||
SecurityToken: getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_SECURITY_TOKEN", "CP_RELATION_BROADCAST_MQ_SECURITY_TOKEN"}, ""),
|
SecurityToken: "",
|
||||||
ConsumerGroup: getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_CONSUMER_GROUP", "CP_RELATION_BROADCAST_MQ_CONSUMER_GROUP"}, "cp-relation-broadcast"),
|
ConsumerGroup: cpRelationBroadcastMQConsumerGroup,
|
||||||
Topic: getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_TOPIC", "CP_RELATION_BROADCAST_MQ_TOPIC"}, "RC_DEFAULT_APP_ORDINARY"),
|
Topic: cpRelationBroadcastMQTopic,
|
||||||
Tag: getEnvAny([]string{"CHATAPP_CP_RELATION_BROADCAST_MQ_TAG", "CP_RELATION_BROADCAST_MQ_TAG"}, "cp_relation_broadcast"),
|
Tag: cpRelationBroadcastMQTag,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
TencentIM: TencentIMConfig{
|
TencentIM: TencentIMConfig{
|
||||||
|
|||||||
@ -103,10 +103,12 @@ func TestLoadTaskCenterMQUsesSharedRocketMQCredentials(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestLoadCPRelationBroadcastMQUsesSharedRocketMQCredentials(t *testing.T) {
|
func TestLoadCPRelationBroadcastMQUsesSharedRocketMQCredentials(t *testing.T) {
|
||||||
t.Setenv("CHATAPP_CP_RELATION_BROADCAST_MQ_ENABLED", "true")
|
|
||||||
t.Setenv("LIKEI_ROCKETMQ_ENDPOINT", "rmq.example.com:8081")
|
t.Setenv("LIKEI_ROCKETMQ_ENDPOINT", "rmq.example.com:8081")
|
||||||
t.Setenv("LIKEI_ROCKETMQ_ACCESS_KEY", "access-key")
|
t.Setenv("LIKEI_ROCKETMQ_ACCESS_KEY", "access-key")
|
||||||
t.Setenv("LIKEI_ROCKETMQ_SECRET_KEY", "access-secret")
|
t.Setenv("LIKEI_ROCKETMQ_SECRET_KEY", "access-secret")
|
||||||
|
t.Setenv("CHATAPP_CP_RELATION_BROADCAST_MQ_ENDPOINT", "should-not-use:8081")
|
||||||
|
t.Setenv("CHATAPP_CP_RELATION_BROADCAST_MQ_TOPIC", "should-not-use")
|
||||||
|
t.Setenv("CHATAPP_CP_RELATION_BROADCAST_MQ_TAG", "should-not-use")
|
||||||
|
|
||||||
cfg := Load()
|
cfg := Load()
|
||||||
if !cfg.CPRelationBroadcast.MQ.Enabled {
|
if !cfg.CPRelationBroadcast.MQ.Enabled {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user