商户收款码下载和扫码支付逻辑
diff --git a/config/application-devel-pg-xkx.properties b/config/application-devel-pg-xkx.properties
index 0e5c007..93d6a59 100644
--- a/config/application-devel-pg-xkx.properties
+++ b/config/application-devel-pg-xkx.properties
@@ -7,15 +7,15 @@
#spring.datasource.initialization-mode=always
# Postgresql settings
spring.datasource.platform=postgresql
-spring.datasource.url=jdbc:postgresql://localhost:15432/restaurant
-spring.datasource.username=admin
+spring.datasource.url=jdbc:postgresql://localhost:15432/multi_restaurant
+spring.datasource.username=supwisdom
spring.datasource.password=123456
database.dbtype=postgresql
# Redis settings
spring.redis.host=localhost
-spring.redis.port=16379
-spring.redis.password=kingstar
+spring.redis.port=6379
+spring.redis.password=
spring.redis.database=4
# jwt settings
@@ -27,22 +27,34 @@
spring.jackson.serialization.fail-on-empty-beans=false
# task setting
-# 对账任务
+# \u5BF9\u8D26\u4EFB\u52A1
restaurant.chkdtltask.cron=-
-# 统计任务
+# \u7EDF\u8BA1\u4EFB\u52A1
restaurant.statement.cron=-
-# 客户信息校对任务
+# \u5BA2\u6237\u4FE1\u606F\u6821\u5BF9\u4EFB\u52A1
restaurant.customercheck.cron=-
-# 流水入账任务
+# \u6D41\u6C34\u5165\u8D26\u4EFB\u52A1
restaurant.submitofflinedtl.cron=-
-# 查询流水状态任务
+# \u67E5\u8BE2\u6D41\u6C34\u72B6\u6001\u4EFB\u52A1
restaurant.querydtlresult.cron=-
+cron.offlinedtl= 0 0/5 * * * ?
+payapi.logintime= 0 0/5 * * * ?
+
+restaurant.check_discount_expire.cron=-
+
+auditsys.url=http://172.28.43.20:8082/collect/device/
+
# payapi setting
-payapi.url=http://172.28.201.70:10010/payapi
-payapi.appid=300091
-payapi.appkey=1ec857ac2c7749a4af092cd422e57861
+payapi.url = http://localhost:8080/payapi
+payapi.appid=300003
+payapi.appkey=330414b089d1473e93d8189da2e9af07
# multi-tenant setting
-multi-tenant.head.key=X-TENANT-ID
+multi-tenant.header.key=X-TENANT-ID
+spring.jpa.show-sql=true
+logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n
+logging.level.org.hibernate.SQL=debug
+log4j.logger.org.springframework.orm.jpa=debug
+logging.level.org.springframework.transaction=DEBUG