Merge branch 'mp-server-test' into dev

# Conflicts:
#	mp-admin/src/main/resources/application-test.yml
#	mp-common/src/main/java/com/qs/mp/common/pulsar/PulsarClientService.java

mp-admin/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 mp:
   profile: /home/mangpiao/mp-server
 pay:
-  callbackUrl: https://test-mp.kaimanghe.net/service/notify/payCallback
+  callbackUrl: http://test-api.kaimanghe.net/service/notify/payCallback
 alipay:
-  callbackUrl: https://test-mp.kaimanghe.net/service/notify/alipayCallback
+  callbackUrl: http://test-api.kaimanghe.net/service/notify/alipayCallback
 
 # 日志配置
 logging:
@@ -40,9 +40,9 @@ spring:
         druid:
             # 主库数据源
             master:
-              url: jdbc:mysql://43.143.93.199:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-              username: root
-              password: MP@206206
+                url: jdbc:mysql://43.143.93.199:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: MP@206206
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -152,11 +152,11 @@ ys-pay:
   private-key-path: /home/mangpiao/mp-server/data/ysPayPre.pfx
   public-key-path: /home/mangpiao/mp-server/data/businessgate.cer
   # 支付完后跳转
-  return-url: https://test-mp.kaimanghe.net
+  return-url: https://test-mp-h5.quanshu123.com
   # 回调地址
-  pay-notify-url: https://test-mp.kaimanghe.net/service/notify/ysCallback
+  pay-notify-url: https://test-mp.quanshu123.com/service/notify/ysCallback
   # 分账回调地址
-  div-notify-url: https://test-mp.kaimanghe.net/service/notify/ysDivCallback
+  div-notify-url: https://test-mp.quanshu123.com/service/notify/ysDivCallback
   # 提现回调地址
-  withdraw-notify-url: https://test-mp.kaimanghe.net/service/notify/ysWithdrawCallback
+  withdraw-notify-url: https://test-mp.quanshu123.com/service/notify/ysWithdrawCallback
 

mp-common/src/main/java/com/qs/mp/common/pulsar/PulsarClientService.java

@@ -36,22 +36,22 @@ public class PulsarClientService {
 
 //  @Value("${mq.service-url}")
 //  private String serviceUrl;
-//
+
 //  @Value("${mq.auth-token}")
 //  private String authToken;
-//
+
 //  @Value("${mq.topic-ticket-generate}")
 //  private String topicTicketGenerate;
-//
+
 //  @Value("${mq.topic-ticket-pay}")
 //  private String topicTicketPay;
-//
+
 //  @Value("${mq.consumer-conn}")
 //  private boolean consumerConn;
-//
+
 //  @Value("${mq.consumer-topics}")
 //  private String topics;
-//
+
   @Autowired
   private PulsarConsumer pulsarConsumer;
 
@@ -63,7 +63,7 @@ public class PulsarClientService {
 //        .serviceUrl(serviceUrl)//【集群管理】接入地址处复制
 //        .authentication(AuthenticationFactory.token(authToken))
 //        .build();
-//
+
 //    if (consumerConn) {
 //      consumer = client.newConsumer()
 //          .topic(topics.split(","))//topic完整路径，格式为persistent://集群（租户）ID/命名空间/Topic名称