Browse Source

Merge remote-tracking branch 'origin/master'

ouyang 3 years ago
parent
commit
52e44ddf75

+ 1 - 1
src/main/java/com/izouma/nineth/listener/CreateOrderListener.java

@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
         consumerGroup = "${general.create-order-group}",
         topic = "${general.create-order-topic}",
         consumeMode = ConsumeMode.ORDERLY)
-@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
+//@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
 public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
     private OrderService                  orderService;
     private RedisTemplate<String, Object> redisTemplate;

+ 14 - 14
src/main/resources/application.yaml

@@ -141,13 +141,13 @@ storage:
   provider: aliyun
   local_path: /var/www/upload/
 aliyun:
-  access-key-id: LTAI5tMpp8WrkmTPzZ5CPDMb
-  access-key-secret: D3wIrtL1Y3MSRwqodpRvSdLVvbrAnW
+  access-key-id: LTAI5t67EpuCdZmqeWwa9UTd
+  access-key-secret: pNk2sTqU8ZracbtXelVeUJOz30l6vs
   oss-end-point: oss-cn-hangzhou.aliyuncs.com
-  oss-bucket-name: nanjingnft
-  oss-domain: https://nanjingnft.oss-cn-hangzhou.aliyuncs.com
-  sms-sign: 拉索
-  sms-code: SMS_238310118
+  oss-bucket-name: lasuo
+  oss-domain: https://lasuo.oss-cn-hangzhou.aliyuncs.com
+  sms-sign: 拉索宇宙
+  sms-code: SMS_242570151
   sell-out-code: SMS_211489622
 
 general:
@@ -247,7 +247,7 @@ spring:
     database: 0
     password: jV%93RtjUx82Tp
 general:
-  host: https://test.adcs.vip
+  host: https://www.lasuo.cc
   create-order-group: create-order-group-test
   create-order-topic: create-order-topic-test
   update-stock-group: update-stock-group-test
@@ -268,16 +268,16 @@ general:
   register-topic: register-topic-test
 wx:
   pay:
-    notify-url: https://test.adcs.vip/notify/order/weixin
-    refund-notify-url: https://test.adcs.vip/wx/refundNotify
-    return-url: https://test.adcs.vip/9th/orders
+    notify-url: https:/www.lasuo.cc/notify/order/weixin
+    refund-notify-url: https://www.lasuo.cc/wx/refundNotify
+    return-url: https://www.lasuo.cc/9th/orders
 alipay:
-  notify-url: https://test.adcs.vip/notify/order/alipay
-  return-url: https://test.adcs.vip/9th/home
+  notify-url: https://www.lasuo.cc/notify/order/alipay
+  return-url: https://www.lasuo.cc/9th/home
 adapay:
-  notify-url: https://test.adcs.vip/notify/adapay
+  notify-url: https://www.lasuo.cc/notify/adapay
 sandpay:
-  notify-url: https://test.adcs.vip/sandpay/notify
+  notify-url: https://www.lasuo.cc/sandpay/notify
 ---
 
 spring: