Merge remote-tracking branch 'remotes/origin/master' into 3.x

# Conflicts:
#	pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQTopicProducer.java
#	pcloud-common-core/src/main/java/com/pcloud/common/core/constant/SMSTemplateConstant.java

pcloud-common-config/src/main/resources.perf/public_system.properties

@@ -140,4 +140,6 @@ H5_CW = W23/C1404/
 
 APP_DOMAIN =  https://app10035515.raysyun.com/
 
-https://weixin23.raysgo.com/rayh5/book?fromType=1
\ No newline at end of file
+https://weixin23.raysgo.com/rayh5/book?fromType=1
+
+geo.ip.key = 6667e90a46ed3cbd9c3a32ebfc69fb7e
\ No newline at end of file

pcloud-common-config/src/main/resources.prod/public_system.properties

@@ -149,4 +149,6 @@ hwsms.accout = 761035
 
 hwsms.passward = 48!DO)Z2W4mdKj^(
 
-hwsms.url = https://139.9.32.119:18312/common/sms/sendTemplateMessage
\ No newline at end of file
+hwsms.url = https://139.9.32.119:18312/common/sms/sendTemplateMessage
+
+geo.ip.key = 6667e90a46ed3cbd9c3a32ebfc69fb7e
\ No newline at end of file

pcloud-common-config/src/main/resources.test/public_system.properties

@@ -148,3 +148,5 @@ H5_CW = W23/C1404/
 APP_DOMAIN =  https://app10035515.raysyun.com/
 
 RAYS_H5_URL = https://weixin23.raysgo.com/rayh5/book?fromType=1
+
+geo.ip.key = 6667e90a46ed3cbd9c3a32ebfc69fb7e
\ No newline at end of file

pcloud-common-config/src/main/resources.tsrpd/public_system.properties

@@ -152,3 +152,5 @@ hwsms.accout = 761035
 hwsms.passward = 48!DO)Z2W4mdKj^(
 
 hwsms.url = https://139.9.32.119:18312/common/sms/sendTemplateMessage
+
+geo.ip.key = 6667e90a46ed3cbd9c3a32ebfc69fb7e
\ No newline at end of file

pcloud-common-config/src/main/resources.uat/public_system.properties

@@ -152,4 +152,6 @@ hwsms.accout = 761035
 
 hwsms.passward = 48!DO)Z2W4mdKj^(
 
-hwsms.url = https://139.9.32.119:18312/common/sms/sendTemplateMessage
\ No newline at end of file
+hwsms.url = https://139.9.32.119:18312/common/sms/sendTemplateMessage
+
+geo.ip.key = 6667e90a46ed3cbd9c3a32ebfc69fb7e
\ No newline at end of file

pcloud-common-core/src/main/java/com/pcloud/common/core/mq/MQExchangeConstants.java

@@ -40,6 +40,15 @@ public class MQExchangeConstants {
      * trade 延时队列 routing key
      */
     public static final String TRADE_DELAY_ROUTING_KEY = "trade.routingkey.delay";
+    /**
+     *channel 延时队列交换机
+     */
+    public static final String CHANNEL_DELAYED_EXCHANGE = "channel.exchange.delay";
+
+    /**
+     * channel 延时队列 routing key
+     */
+    public static final String CHANNEL_DELAY_ROUTING_KEY = "channel.routingkey.delay";
 
     /**
      *channel 延时队列交换机