Przeglądaj źródła

配置更改update

MrWang 2 lat temu
rodzic
commit
71d2c87dca

+ 25 - 23
mp-admin/src/main/resources/application-test.yml

@@ -1,10 +1,9 @@
 mp:
-  # 文件路径 示例( Windows配置D:/ygp/uploadPath,Linux配置 /home/ygp/uploadPath)
-  profile: /home/quanshu/mp-server
+  profile: /home/mangpiao/mp-server
 pay:
-  callbackUrl: https://test-mp.quanshu123.com/service/notify/payCallback
+  callbackUrl: https://mptest.kaimanghe.net/service/notify/payCallback
 alipay:
-  callbackUrl: https://test-mp.quanshu123.com/service/notify/alipayCallback
+  callbackUrl: https://mptest.kaimanghe.net/service/notify/alipayCallback
 
 # 日志配置
 logging:
@@ -20,9 +19,9 @@ logging:
 # 数据源配置
 spring:
     redis:
-      host: 172.17.16.14
+      host: 43.143.93.199
       port: 6379
-      password: '@9(s2sWppxkess'
+      password: 1PQd[NOc$8pWGNJ
       # 连接超时时间(毫秒)
       timeout: 10000
       jedis:
@@ -41,9 +40,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.17.16.14:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: mptest
-                password: wan789*@dfhzHu518!dr2xosn
+              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:
                 # 从数据源开关/默认关闭
@@ -121,13 +120,13 @@ cloud:
   secretKey: TgbFcjZ8HDse9ToujIabLo1yf5YqtfBX
   region: ap-shanghai
 
-mq:
-  consumer-conn: true
-  service-url: http://pulsar-op4bzppa37m4.tdmq-pulsar.ap-sh.public.tencenttdmq.com:8080
-  auth-token: eyJrZXlJZCI6InB1bHNhci1vcDRienBwYTM3bTQiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJwdWxzYXItb3A0YnpwcGEzN200X21wLXNlcnZlci10ZXN0In0.GVeFHHSqIYqTeOtXItWOT-NfydCSNvvVVS2FlpFZNKY
-  topic-ticket-generate: pulsar-op4bzppa37m4/test-share/topic-ticket-generate
-  topic-ticket-pay: pulsar-op4bzppa37m4/test-share/topic-ticket-pay
-  consumer-topics: pulsar-op4bzppa37m4/test-share/topic-ticket-generate,pulsar-op4bzppa37m4/test-share/topic-ticket-pay
+#mq:
+#  consumer-conn: true
+#  service-url: http://pulsar-op4bzppa37m4.tdmq-pulsar.ap-sh.public.tencenttdmq.com:8080
+#  auth-token: eyJrZXlJZCI6InB1bHNhci1vcDRienBwYTM3bTQiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJwdWxzYXItb3A0YnpwcGEzN200X21wLXNlcnZlci10ZXN0In0.GVeFHHSqIYqTeOtXItWOT-NfydCSNvvVVS2FlpFZNKY
+#  topic-ticket-generate: pulsar-op4bzppa37m4/test-share/topic-ticket-generate
+#  topic-ticket-pay: pulsar-op4bzppa37m4/test-share/topic-ticket-pay
+#  consumer-topics: pulsar-op4bzppa37m4/test-share/topic-ticket-generate,pulsar-op4bzppa37m4/test-share/topic-ticket-pay
 
 
 # 小程序
@@ -149,14 +148,17 @@ bind:
 
 # 银盛支付配置
 ys-pay:
-  private-key-path: /home/quanshu/mp-server/data/ysPayPre.pfx
-  public-key-path: /home/quanshu/mp-server/data/businessgate.cer
+  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-h5.quanshu123.com
+#  return-url: https://test-mp-h5.quanshu123.com
+  return-url: https://mptest.kaimanghe.net
   # 回调地址
-  pay-notify-url: https://test-mp.quanshu123.com/service/notify/ysCallback
+#  pay-notify-url: https://test-mp.quanshu123.com/service/notify/ysCallback
+  pay-notify-url: https://mptest.kaimanghe.net/service/notify/ysCallback
   # 分账回调地址
-  div-notify-url: https://test-mp.quanshu123.com/service/notify/ysDivCallback
+#  div-notify-url: https://test-mp.quanshu123.com/service/notify/ysDivCallback
+  div-notify-url: https://mptest.kaimanghe.net/service/notify/ysDivCallback
   # 提现回调地址
-  withdraw-notify-url: https://test-mp.quanshu123.com/service/notify/ysWithdrawCallback
-
+#  withdraw-notify-url: https://test-mp.quanshu123.com/service/notify/ysWithdrawCallback
+  withdraw-notify-url: https://mptest.kaimanghe.net/service/notify/ysWithdrawCallback

+ 1 - 1
mp-admin/src/main/resources/application.yml

@@ -30,7 +30,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: test
   # 文件上传
   servlet:
      multipart:

+ 1 - 1
mp-admin/src/main/resources/logback-8091.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/quanshu/mp-server" />
+	<property name="log.path" value="/home/mangpiao/mp-server"/>
     <!-- 日志输出格式 -->
     <!-- You can override this to have a custom pattern -->
 	<property name="CONSOLE_LOG_PATTERN" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

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

@@ -34,54 +34,54 @@ public class PulsarClientService {
   private PulsarClient client;
   private Consumer<byte[]> consumer;
 
-  @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;
-
+//  @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;
 
   private final ConcurrentHashMap<String, Producer<byte[]>> Producers = new ConcurrentHashMap<String, Producer<byte[]>>();
 
-  @PostConstruct
-  public void init() throws PulsarClientException {
-    client = PulsarClient.builder()
-        .serviceUrl(serviceUrl)//【集群管理】接入地址处复制
-        .authentication(AuthenticationFactory.token(authToken))
-        .build();
-
-    if (consumerConn) {
-      consumer = client.newConsumer()
-          .topic(topics.split(","))//topic完整路径,格式为persistent://集群(租户)ID/命名空间/Topic名称
-          .subscriptionName("mp")//需要现在控制台或者通过控制台API创建好一个订阅,此处填写订阅名
-          .subscriptionType(SubscriptionType.Exclusive)//声明消费模式为exclusive(独占)模式
-          .subscriptionInitialPosition(
-              SubscriptionInitialPosition.Earliest)//配置从最早开始消费,否则可能会消费不到历史消息
-          .subscribe();
-      new Thread(() -> {
-        try {
-          loop();
-        } catch (Exception e) {
-          logger.error("消费Pulsar数据异常,停止Pulsar连接:", e);
-          close();
-        }
-      }).start();
-    }
-  }
+//  @PostConstruct
+//  public void init() throws PulsarClientException {
+//    client = PulsarClient.builder()
+//        .serviceUrl(serviceUrl)//【集群管理】接入地址处复制
+//        .authentication(AuthenticationFactory.token(authToken))
+//        .build();
+//
+//    if (consumerConn) {
+//      consumer = client.newConsumer()
+//          .topic(topics.split(","))//topic完整路径,格式为persistent://集群(租户)ID/命名空间/Topic名称
+//          .subscriptionName("mp")//需要现在控制台或者通过控制台API创建好一个订阅,此处填写订阅名
+//          .subscriptionType(SubscriptionType.Exclusive)//声明消费模式为exclusive(独占)模式
+//          .subscriptionInitialPosition(
+//              SubscriptionInitialPosition.Earliest)//配置从最早开始消费,否则可能会消费不到历史消息
+//          .subscribe();
+//      new Thread(() -> {
+//        try {
+//          loop();
+//        } catch (Exception e) {
+//          logger.error("消费Pulsar数据异常,停止Pulsar连接:", e);
+//          close();
+//        }
+//      }).start();
+//    }
+//  }
 
   private void loop() throws Exception {
     //消费消息
@@ -104,60 +104,60 @@ public class PulsarClientService {
     }
   }
 
-  /**
-   * @param mqTopicType
-   * @param data        内容为json格式
-   * @throws PulsarClientException
-   */
-  public void producer(MqTopicType mqTopicType, String data) throws PulsarClientException {
-    logger.info("start producer mq data:" + data);
-    String topic = "";
-    if (mqTopicType.getValue() == MqTopicType.ticket_generate.getValue()) {
-      topic = topicTicketGenerate; // 盲票生成
-    } else if (mqTopicType.getValue() == MqTopicType.ticket_pay.getValue()) {
-      topic = topicTicketPay; // 盲票付款成功
-    }
-    Producer<byte[]> producer = null;
-    if (Producers.containsKey(mqTopicType.getValue())) {
-      producer = Producers.get(mqTopicType.getValue());
-    } else {
-      producer = client.newProducer()
-          .topic(topic)//topic完整路径,格式为persistent://集群(租户)ID/命名空间/Topic名称
-          .enableBatching(true)
-          .create();
-      Producers.put(mqTopicType.getValue(), producer);
-    }
-
-    /*
-    producer.newMessage()//发送消息
-        .key(mqTopicType.getValue())
-        .value(data.getBytes())
-            .send();
-
-
-     */
-    CompletableFuture<MessageId> messageIdFuture = producer.newMessage()
-        .key(mqTopicType.getValue())
-        .value(data.getBytes())
-        .sendAsync();
-    Producer<byte[]> finalProducer = producer;
-    messageIdFuture.whenComplete(((messageId, throwable) -> {
-      if (null != throwable) {
-        logger.error("【消息投递异常,开始重试】mq data:" + data, throwable);
-        //todo 失败重试策略
-        try {
-          finalProducer.newMessage().deliverAfter(5, TimeUnit.SECONDS
-          ).key(mqTopicType.getValue()).value(data.getBytes()).send();
-        } catch (PulsarClientException e) {
-          logger.error("重试投递失败", e);
-          //todo 保存数据库,增加失败重试,通过体系化重试框架保证消息投递完整性
-        }
-      } else {
-        logger.info("【消息成功投递】");
-      }
-    }));
-
-  }
+//  /**
+//   * @param mqTopicType
+//   * @param data        内容为json格式
+//   * @throws PulsarClientException
+//   */
+//  public void producer(MqTopicType mqTopicType, String data) throws PulsarClientException {
+//    logger.info("start producer mq data:" + data);
+//    String topic = "";
+//    if (mqTopicType.getValue() == MqTopicType.ticket_generate.getValue()) {
+//      topic = topicTicketGenerate; // 盲票生成
+//    } else if (mqTopicType.getValue() == MqTopicType.ticket_pay.getValue()) {
+//      topic = topicTicketPay; // 盲票付款成功
+//    }
+//    Producer<byte[]> producer = null;
+//    if (Producers.containsKey(mqTopicType.getValue())) {
+//      producer = Producers.get(mqTopicType.getValue());
+//    } else {
+//      producer = client.newProducer()
+//          .topic(topic)//topic完整路径,格式为persistent://集群(租户)ID/命名空间/Topic名称
+//          .enableBatching(true)
+//          .create();
+//      Producers.put(mqTopicType.getValue(), producer);
+//    }
+//
+//    /*
+//    producer.newMessage()//发送消息
+//        .key(mqTopicType.getValue())
+//        .value(data.getBytes())
+//            .send();
+//
+//
+//     */
+//    CompletableFuture<MessageId> messageIdFuture = producer.newMessage()
+//        .key(mqTopicType.getValue())
+//        .value(data.getBytes())
+//        .sendAsync();
+//    Producer<byte[]> finalProducer = producer;
+//    messageIdFuture.whenComplete(((messageId, throwable) -> {
+//      if (null != throwable) {
+//        logger.error("【消息投递异常,开始重试】mq data:" + data, throwable);
+//        //todo 失败重试策略
+//        try {
+//          finalProducer.newMessage().deliverAfter(5, TimeUnit.SECONDS
+//          ).key(mqTopicType.getValue()).value(data.getBytes()).send();
+//        } catch (PulsarClientException e) {
+//          logger.error("重试投递失败", e);
+//          //todo 保存数据库,增加失败重试,通过体系化重试框架保证消息投递完整性
+//        }
+//      } else {
+//        logger.info("【消息成功投递】");
+//      }
+//    }));
+//
+//  }
 
   public void consumer() throws PulsarClientException {
 

+ 13 - 13
mp-quartz/src/main/java/com/qs/mp/quartz/task/OperateToolTask.java

@@ -21,8 +21,8 @@ public class OperateToolTask {
 
   protected final Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
-  @Autowired
-  private PulsarClientService pulsarClientService;
+//  @Autowired
+//  private PulsarClientService pulsarClientService;
 
   @Autowired
   private IWalletService walletService;
@@ -30,17 +30,17 @@ public class OperateToolTask {
   /**
    * 重新发送消息
    */
-  public void resendTicketPayMsg(String orderId) {
-    LogUtil.info(logger, "...重新发送盲票支付消息任务开始...");
-
-    try {
-      pulsarClientService.producer(MqTopicType.ticket_pay, orderId);
-    } catch (Exception e) {
-      LogUtil.error(logger, e, "重新发送盲票支付消息异常。orderId:{0}", orderId);
-    }
-
-    LogUtil.info(logger, "...重新发送盲票支付消息任务结束...");
-  }
+//  public void resendTicketPayMsg(String orderId) {
+//    LogUtil.info(logger, "...重新发送盲票支付消息任务开始...");
+//
+//    try {
+//      pulsarClientService.producer(MqTopicType.ticket_pay, orderId);
+//    } catch (Exception e) {
+//      LogUtil.error(logger, e, "重新发送盲票支付消息异常。orderId:{0}", orderId);
+//    }
+//
+//    LogUtil.info(logger, "...重新发送盲票支付消息任务结束...");
+//  }
 
 
   /**