Commit 6e53a16d by huluobin

config update

parent e23c8354
...@@ -15,18 +15,19 @@ wechat: ...@@ -15,18 +15,19 @@ wechat:
# 预约过期订阅消息模板id # 预约过期订阅消息模板id
over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA
# 支付成功订阅消息模板id # 支付成功订阅消息模板id
pay-success-tpl: 8-wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI pay-success-tpl: wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI
# 订单支付订阅消息模板id # 订单支付订阅消息模板id
order-pay-notify-tpl: s-uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE order-pay-notify-tpl: uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
# 预约提醒订阅店铺消息模板id # 预约提醒订阅店铺消息模板id
shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
# 预约过期订阅店铺消息模板id # 预约过期订阅店铺消息模板id
shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
# 取消预约店铺提醒 # 取消预约店铺提醒
shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
spring: spring:
# 微服务名称 # 微服务名称
...@@ -35,9 +36,9 @@ spring: ...@@ -35,9 +36,9 @@ spring:
# 数据配置 # 数据配置
datasource: datasource:
# url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://127.0.0.1:3306/gogirl_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root username: root
password: "123456" password: "#7kfnymAM$Y9-Ntf"
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
...@@ -48,11 +49,11 @@ spring: ...@@ -48,11 +49,11 @@ spring:
database: 0 database: 0
lettuce: lettuce:
pool: pool:
max-active: 200 max-active: 1000
max-wait: -1ms max-wait: -1ms
max-idle: 20 max-idle: 200
min-idle: 0 min-idle: 0
timeout: 2000ms timeout: 60000ms
#项目属性 #项目属性
...@@ -68,7 +69,7 @@ gogirl: ...@@ -68,7 +69,7 @@ gogirl:
#商城退款订单回调 #商城退款订单回调
notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder" notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调接口 #微信余额支付回调接口
notify-balance-wx-pay: "http://wwww.begogirls.com/customer/pay/notifyBalanceWxPay" notify-balance-wx-pay: "http://www.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址 #服务器图片临时地址
picture-path: /upload/grouppic/ picture-path: /upload/grouppic/
...@@ -78,7 +79,6 @@ gogirl: ...@@ -78,7 +79,6 @@ gogirl:
#评论延迟时间 #评论延迟时间
test-paper-time: 1 test-paper-time: 1
#用户微信支付商户配置
wx: wx:
pay: pay:
appId: wx058b46db3cd0e979 appId: wx058b46db3cd0e979
......
...@@ -15,18 +15,19 @@ wechat: ...@@ -15,18 +15,19 @@ wechat:
# 预约过期订阅消息模板id # 预约过期订阅消息模板id
over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA
# 支付成功订阅消息模板id # 支付成功订阅消息模板id
pay-success-tpl: 8-wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI pay-success-tpl: wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI
# 订单支付订阅消息模板id # 订单支付订阅消息模板id
order-pay-notify-tpl: s-uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE order-pay-notify-tpl: uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
# 预约提醒订阅店铺消息模板id # 预约提醒订阅店铺消息模板id
shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
# 预约过期订阅店铺消息模板id # 预约过期订阅店铺消息模板id
shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
# 取消预约店铺提醒 # 取消预约店铺提醒
shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
spring: spring:
# 微服务名称 # 微服务名称
...@@ -48,27 +49,27 @@ spring: ...@@ -48,27 +49,27 @@ spring:
database: 0 database: 0
lettuce: lettuce:
pool: pool:
max-active: 200 max-active: 1000
max-wait: -1ms max-wait: -1ms
max-idle: 20 max-idle: 200
min-idle: 0 min-idle: 0
timeout: 2000ms timeout: 60000ms
#项目属性 #项目属性
gogirl: gogirl:
#充值回调地址 #充值回调地址
notify-charge: "http://t.begogirls.com/customer/pay/notifyCharge" notify-charge: "http://www.begogirls.com/customer/pay/notifyCharge"
#次卡购买回调地址 #次卡购买回调地址
notify-timescard: "http://t.begogirls.com/customer/pay/notifyTimesCard" notify-timescard: "http://www.begogirls.com/customer/pay/notifyTimesCard"
#预约订单支付回调地址 #预约订单支付回调地址
notify-order: "http://t.begogirls.com/customer/pay/notifyOrder" notify-order: "http://www.begogirls.com/customer/pay/notifyOrder"
#商城订单支付回调 #商城订单支付回调
notify-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyMallOrder" notify-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyMallOrder"
#商城退款订单回调 #商城退款订单回调
notify-refund-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder" notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调接口 #微信余额支付回调接口
notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay" notify-balance-wx-pay: "http://www.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址 #服务器图片临时地址
picture-path: /upload/grouppic/ picture-path: /upload/grouppic/
...@@ -77,6 +78,7 @@ gogirl: ...@@ -77,6 +78,7 @@ gogirl:
start-time: "10:00:00" start-time: "10:00:00"
#评论延迟时间 #评论延迟时间
test-paper-time: 1 test-paper-time: 1
wx: wx:
pay: pay:
appId: wx058b46db3cd0e979 appId: wx058b46db3cd0e979
......
...@@ -20,8 +20,6 @@ wechat: ...@@ -20,8 +20,6 @@ wechat:
order-pay-notify-tpl: uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE order-pay-notify-tpl: uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
#提醒评论模板消息 #提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0 test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
# 预约提醒订阅店铺消息模板id # 预约提醒订阅店铺消息模板id
shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
# 预约过期订阅店铺消息模板id # 预约过期订阅店铺消息模板id
......
...@@ -15,18 +15,19 @@ wechat: ...@@ -15,18 +15,19 @@ wechat:
# 预约过期订阅消息模板id # 预约过期订阅消息模板id
over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA
# 支付成功订阅消息模板id # 支付成功订阅消息模板id
pay-success-tpl: 8-wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI pay-success-tpl: wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI
# 订单支付订阅消息模板id # 订单支付订阅消息模板id
order-pay-notify-tpl: s-uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE order-pay-notify-tpl: uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
# 预约提醒订阅店铺消息模板id # 预约提醒订阅店铺消息模板id
shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
# 预约过期订阅店铺消息模板id # 预约过期订阅店铺消息模板id
shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
# 取消预约店铺提醒 # 取消预约店铺提醒
shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
spring: spring:
# 微服务名称 # 微服务名称
...@@ -48,11 +49,11 @@ spring: ...@@ -48,11 +49,11 @@ spring:
database: 0 database: 0
lettuce: lettuce:
pool: pool:
max-active: 200 max-active: 1000
max-wait: -1ms max-wait: -1ms
max-idle: 20 max-idle: 200
min-idle: 0 min-idle: 0
timeout: 2000ms timeout: 60000ms
#项目属性 #项目属性
...@@ -68,7 +69,7 @@ gogirl: ...@@ -68,7 +69,7 @@ gogirl:
#商城退款订单回调 #商城退款订单回调
notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder" notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调接口 #微信余额支付回调接口
notify-balance-wx-pay: "http://wwww.begogirls.com/customer/pay/notifyBalanceWxPay" notify-balance-wx-pay: "http://www.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址 #服务器图片临时地址
picture-path: /upload/grouppic/ picture-path: /upload/grouppic/
...@@ -77,6 +78,7 @@ gogirl: ...@@ -77,6 +78,7 @@ gogirl:
start-time: "10:00:00" start-time: "10:00:00"
#评论延迟时间 #评论延迟时间
test-paper-time: 1 test-paper-time: 1
wx: wx:
pay: pay:
appId: wx058b46db3cd0e979 appId: wx058b46db3cd0e979
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment